blob: a37f4e62fd6c238114b793dbf7ae48c0449866fc [file] [log] [blame]
Glenn L McGrath655d8142003-06-22 15:32:41 +00001/* vi: set sw=4 ts=4: */
2/*
3 * busybox patch applet to handle the unified diff format.
Denis Vlasenko0beaff82007-09-21 13:16:32 +00004 * Copyright (C) 2003 Glenn McGrath
Glenn L McGrath655d8142003-06-22 15:32:41 +00005 *
Bernhard Reutner-Fischeree9cf482005-10-27 06:59:05 +00006 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
Glenn L McGrath655d8142003-06-22 15:32:41 +00007 *
8 * This applet is written to work with patches generated by GNU diff,
9 * where there is equivalent functionality busybox patch shall behave
10 * as per GNU patch.
11 *
12 * There is a SUSv3 specification for patch, however it looks to be
13 * incomplete, it doesnt even mention unified diff format.
14 * http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
15 *
16 * Issues
17 * - Non-interactive
Denis Vlasenko0a10da22006-12-17 00:49:56 +000018 * - Patches must apply cleanly or patch (not just one hunk) will fail.
Glenn L McGrath655d8142003-06-22 15:32:41 +000019 * - Reject file isnt saved
Glenn L McGrath655d8142003-06-22 15:32:41 +000020 */
21
Denis Vlasenkob6adbf12007-05-26 19:00:18 +000022#include "libbb.h"
Glenn L McGrath655d8142003-06-22 15:32:41 +000023
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000024static unsigned copy_lines(FILE *src_stream, FILE *dest_stream, unsigned lines_count)
Glenn L McGrath655d8142003-06-22 15:32:41 +000025{
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000026 while (src_stream && lines_count) {
Glenn L McGrath655d8142003-06-22 15:32:41 +000027 char *line;
Denis Vlasenko2d5ca602006-10-12 22:43:20 +000028 line = xmalloc_fgets(src_stream);
Glenn L McGrath655d8142003-06-22 15:32:41 +000029 if (line == NULL) {
30 break;
31 }
32 if (fputs(line, dest_stream) == EOF) {
Denis Vlasenkoe1a0d482006-10-20 13:28:22 +000033 bb_perror_msg_and_die("error writing to new file");
Glenn L McGrath655d8142003-06-22 15:32:41 +000034 }
35 free(line);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000036 lines_count--;
Glenn L McGrath655d8142003-06-22 15:32:41 +000037 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000038 return lines_count;
Glenn L McGrath655d8142003-06-22 15:32:41 +000039}
40
41/* If patch_level is -1 it will remove all directory names
42 * char *line must be greater than 4 chars
43 * returns NULL if the file doesnt exist or error
44 * returns malloc'ed filename
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000045 * NB: frees 1st argument!
Glenn L McGrath655d8142003-06-22 15:32:41 +000046 */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000047static char *extract_filename_and_free_line(char *line, int patch_level)
Glenn L McGrath655d8142003-06-22 15:32:41 +000048{
Rob Landleybaa89b32006-05-07 21:10:06 +000049 char *temp, *filename_start_ptr = line + 4;
Glenn L McGrath655d8142003-06-22 15:32:41 +000050
51 /* Terminate string at end of source filename */
Denis Vlasenkoeea72122007-08-06 13:34:10 +000052 temp = strchrnul(filename_start_ptr, '\t');
53 *temp = '\0';
Glenn L McGrath655d8142003-06-22 15:32:41 +000054
Denis Vlasenkoeea72122007-08-06 13:34:10 +000055 /* Skip over (patch_level) number of leading directories */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000056 while (patch_level--) {
Denis Vlasenko51742f42007-04-12 00:32:05 +000057 temp = strchr(filename_start_ptr, '/');
58 if (!temp)
59 break;
Rob Landleybaa89b32006-05-07 21:10:06 +000060 filename_start_ptr = temp + 1;
Glenn L McGrath655d8142003-06-22 15:32:41 +000061 }
62
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000063 temp = xstrdup(filename_start_ptr);
64 free(line);
65 return temp;
Glenn L McGrath655d8142003-06-22 15:32:41 +000066}
67
Denis Vlasenko9b49a5e2007-10-11 10:05:36 +000068int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
Denis Vlasenko68404f12008-03-17 09:00:54 +000069int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
Glenn L McGrath655d8142003-06-22 15:32:41 +000070{
Denis Vlasenko2a7a4512008-03-18 01:38:04 +000071 struct stat saved_stat;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000072 char *patch_line;
73 FILE *patch_file;
74 int patch_level;
75 int ret = 0;
76
77 xfunc_error_retval = 2;
Rob Landley078bacf2005-09-01 03:02:23 +000078 {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000079 const char *p = "-1";
80 const char *i = "-"; /* compat */
81 getopt32(argv, "p:i:", &p, &i);
82 patch_level = xatoi(p); /* can be negative! */
83 patch_file = xfopen_stdin(i);
Glenn L McGrath655d8142003-06-22 15:32:41 +000084 }
85
Denis Vlasenkofc77eb52007-08-01 23:30:54 +000086 patch_line = xmalloc_getline(patch_file);
Glenn L McGrath655d8142003-06-22 15:32:41 +000087 while (patch_line) {
88 FILE *src_stream;
89 FILE *dst_stream;
90 char *original_filename;
91 char *new_filename;
92 char *backup_filename;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000093 unsigned src_cur_line = 1;
94 unsigned dest_cur_line = 0;
95 unsigned dest_beg_line;
96 unsigned bad_hunk_count = 0;
97 unsigned hunk_count = 0;
98 smallint copy_trailing_lines_flag = 0;
Glenn L McGrath655d8142003-06-22 15:32:41 +000099
100 /* Skip everything upto the "---" marker
101 * No need to parse the lines "Only in <dir>", and "diff <args>"
102 */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000103 while (strncmp(patch_line, "--- ", 4) != 0) {
Glenn L McGrath655d8142003-06-22 15:32:41 +0000104 free(patch_line);
Denis Vlasenkofc77eb52007-08-01 23:30:54 +0000105 patch_line = xmalloc_getline(patch_file);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000106 if (!patch_line)
107 bb_error_msg_and_die("invalid patch");
Glenn L McGrath655d8142003-06-22 15:32:41 +0000108 }
109
110 /* Extract the filename used before the patch was generated */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000111 original_filename = extract_filename_and_free_line(patch_line, patch_level);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000112
Denis Vlasenkofc77eb52007-08-01 23:30:54 +0000113 patch_line = xmalloc_getline(patch_file);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000114 if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0)
115 bb_error_msg_and_die("invalid patch");
116 new_filename = extract_filename_and_free_line(patch_line, patch_level);
Denis Vlasenko2a7a4512008-03-18 01:38:04 +0000117
118 /* Get access rights from the file to be patched, -1 file does not exist */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000119 if (stat(new_filename, &saved_stat) != 0) {
Glenn L McGrath655d8142003-06-22 15:32:41 +0000120 char *line_ptr;
121 /* Create leading directories */
122 line_ptr = strrchr(new_filename, '/');
123 if (line_ptr) {
124 *line_ptr = '\0';
125 bb_make_directory(new_filename, -1, FILEUTILS_RECUR);
126 *line_ptr = '/';
127 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000128 backup_filename = NULL;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000129 saved_stat.st_mode = 0644;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000130 } else {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000131 backup_filename = xasprintf("%s.orig", new_filename);
Denis Vlasenkocb448fe2008-02-17 14:28:53 +0000132 xrename(new_filename, backup_filename);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000133 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000134 dst_stream = xfopen(new_filename, "w");
135 fchmod(fileno(dst_stream), saved_stat.st_mode);
136 src_stream = NULL;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000137
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000138 if (backup_filename && !stat(original_filename, &saved_stat)) {
139 src_stream = xfopen((strcmp(original_filename, new_filename)) ?
140 original_filename : backup_filename, "r");
Glenn L McGrath655d8142003-06-22 15:32:41 +0000141 }
142
143 printf("patching file %s\n", new_filename);
144
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000145 /* Handle all hunks for this file */
Denis Vlasenko2d5ca602006-10-12 22:43:20 +0000146 patch_line = xmalloc_fgets(patch_file);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000147 while (patch_line) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000148 unsigned count;
149 unsigned src_beg_line;
150 unsigned unused;
151 unsigned hunk_offset_start = 0;
152 smallint hunk_error = 0;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000153
154 /* This bit should be improved */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000155 if ((sscanf(patch_line, "@@ -%d,%d +%d,%d @@", &src_beg_line, &unused, &dest_beg_line, &unused) != 4)
156 && (sscanf(patch_line, "@@ -%d,%d +%d @@", &src_beg_line, &unused, &dest_beg_line) != 3)
157 && (sscanf(patch_line, "@@ -%d +%d,%d @@", &src_beg_line, &dest_beg_line, &unused) != 3)
158 ) {
Glenn L McGrath655d8142003-06-22 15:32:41 +0000159 /* No more hunks for this file */
160 break;
161 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000162 hunk_count++;
163
164 if (src_beg_line && dest_beg_line) {
165 /* Copy unmodified lines upto start of hunk */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000166 /* src_beg_line will be 0 if it's a new file */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000167 count = src_beg_line - src_cur_line;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000168 if (copy_lines(src_stream, dst_stream, count)) {
Denis Vlasenkoe1a0d482006-10-20 13:28:22 +0000169 bb_error_msg_and_die("bad src file");
Glenn L McGrath655d8142003-06-22 15:32:41 +0000170 }
171 src_cur_line += count;
172 dest_cur_line += count;
173 copy_trailing_lines_flag = 1;
174 }
175 hunk_offset_start = src_cur_line;
176
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000177 while (1) {
178 free(patch_line);
179 patch_line = xmalloc_fgets(patch_file);
180 if (patch_line == NULL) break;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000181 if ((*patch_line == '-') || (*patch_line == ' ')) {
182 char *src_line = NULL;
183 if (src_stream) {
Denis Vlasenko2d5ca602006-10-12 22:43:20 +0000184 src_line = xmalloc_fgets(src_stream);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000185 if (src_line) {
186 int diff = strcmp(src_line, patch_line + 1);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000187 src_cur_line++;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000188 free(src_line);
189 if (diff) src_line = NULL;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000190 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000191 if (!src_line) {
Denis Vlasenkoe1a0d482006-10-20 13:28:22 +0000192 bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000193 hunk_error = 1;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000194 break;
195 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000196 }
197 if (*patch_line == ' ') {
198 fputs(patch_line + 1, dst_stream);
199 dest_cur_line++;
200 }
201 } else if (*patch_line == '+') {
202 fputs(patch_line + 1, dst_stream);
203 dest_cur_line++;
204 } else {
205 break;
206 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000207 } /* end of while loop handling one hunk */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000208 if (hunk_error) {
209 bad_hunk_count++;
210 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000211 } /* end of while loop handling one file */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000212
213 /* Cleanup last patched file */
214 if (copy_trailing_lines_flag) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000215 copy_lines(src_stream, dst_stream, (unsigned)(-1));
Glenn L McGrath655d8142003-06-22 15:32:41 +0000216 }
217 if (src_stream) {
218 fclose(src_stream);
219 }
220 if (dst_stream) {
221 fclose(dst_stream);
222 }
223 if (bad_hunk_count) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000224 ret = 1;
225 bb_error_msg("%u out of %u hunk FAILED", bad_hunk_count, hunk_count);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000226 } else {
227 /* It worked, we can remove the backup */
228 if (backup_filename) {
229 unlink(backup_filename);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000230 free(backup_filename);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000231 }
232 if ((dest_cur_line == 0) || (dest_beg_line == 0)) {
233 /* The new patched file is empty, remove it */
Denis Vlasenko1bb552b2007-04-05 21:25:15 +0000234 xunlink(new_filename);
235 if (strcmp(new_filename, original_filename) != 0)
236 xunlink(original_filename);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000237 }
238 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000239 } /* end of "while there are patch lines" */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000240
Eric Andersenc7bda1c2004-03-15 08:29:22 +0000241 /* 0 = SUCCESS
Glenn L McGrath655d8142003-06-22 15:32:41 +0000242 * 1 = Some hunks failed
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000243 * 2 = More serious problems (exited earlier)
Glenn L McGrath655d8142003-06-22 15:32:41 +0000244 */
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000245 return ret;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000246}