blob: 62477af163f84d440eaac704798af83626cd911d [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 Vlasenko08ec67b2008-03-26 13:32:30 +000024static unsigned copy_lines(FILE *src_stream, FILE *dst_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 }
Denis Vlasenko08ec67b2008-03-26 13:32:30 +000032 if (fputs(line, dst_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 Vlasenko64a76d72008-03-24 18:18:03 +000047static char *extract_filename(char *line, int patch_level, const char *pat)
Glenn L McGrath655d8142003-06-22 15:32:41 +000048{
Denis Vlasenko64a76d72008-03-24 18:18:03 +000049 char *temp = NULL, *filename_start_ptr = line + 4;
Glenn L McGrath655d8142003-06-22 15:32:41 +000050
Denis Vlasenko64a76d72008-03-24 18:18:03 +000051 if (strncmp(line, pat, 4) == 0) {
52 /* Terminate string at end of source filename */
Denis Vlasenkof5d8c902008-06-26 14:32:57 +000053 line[strcspn(line, "\t\n\r")] = '\0';
Glenn L McGrath655d8142003-06-22 15:32:41 +000054
Denis Vlasenko64a76d72008-03-24 18:18:03 +000055 /* Skip over (patch_level) number of leading directories */
56 while (patch_level--) {
57 temp = strchr(filename_start_ptr, '/');
58 if (!temp)
59 break;
60 filename_start_ptr = temp + 1;
61 }
62 temp = xstrdup(filename_start_ptr);
Glenn L McGrath655d8142003-06-22 15:32:41 +000063 }
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000064 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 Vlasenkoa60f84e2008-07-05 09:18:54 +000069int patch_main(int argc UNUSED_PARAM, 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;
Denis Vlasenko08ec67b2008-03-26 13:32:30 +000076 char plus = '+';
Denys Vlasenkod7874ed2009-08-20 23:33:19 +020077 unsigned opt;
78 enum {
79 OPT_R = (1 << 2),
80 OPT_N = (1 << 3),
Denys Vlasenkofeadfe72010-01-22 04:17:07 +010081 /*OPT_f = (1 << 4), ignored */
82 /*OPT_E = (1 << 5), ignored, this is the default */
Denys Vlasenko8b8d32e2010-01-22 05:10:33 +010083 /*OPT_g = (1 << 6), ignored */
84 OPT_dry_run = (1 << 7) * ENABLE_LONG_OPTS,
Denys Vlasenkod7874ed2009-08-20 23:33:19 +020085 };
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000086
Denis Vlasenkoc6938402008-03-24 02:18:03 +000087 xfunc_error_retval = 2;
Rob Landley078bacf2005-09-01 03:02:23 +000088 {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +000089 const char *p = "-1";
90 const char *i = "-"; /* compat */
Denys Vlasenko17c838b2009-10-24 17:11:55 +020091#if ENABLE_LONG_OPTS
92 static const char patch_longopts[] ALIGN1 =
Denys Vlasenkofeadfe72010-01-22 04:17:07 +010093 "strip\0" Required_argument "p"
94 "input\0" Required_argument "i"
95 "reverse\0" No_argument "R"
96 "forward\0" No_argument "N"
97 /* "Assume user knows what [s]he is doing, do not ask any questions": */
98 "force\0" No_argument "f" /*ignored*/
99# if ENABLE_DESKTOP
100 "remove-empty-files\0" No_argument "E" /*ignored*/
101 /* "Controls actions when a file is under RCS or SCCS control,
102 * and does not exist or is read-only and matches the default version,
103 * or when a file is under ClearCase control and does not exist..."
Denys Vlasenko8b8d32e2010-01-22 05:10:33 +0100104 * IOW: rather obscure option.
105 * But Gentoo's portage does use -g0 */
106 "get\0" Required_argument "g" /*ignored*/
Denys Vlasenkofeadfe72010-01-22 04:17:07 +0100107# endif
108 "dry-run\0" No_argument "\xfd"
109# if ENABLE_DESKTOP
110 "backup-if-mismatch\0" No_argument "\xfe" /*ignored*/
111 "no-backup-if-mismatch\0" No_argument "\xff" /*ignored*/
112# endif
Denys Vlasenko17c838b2009-10-24 17:11:55 +0200113 ;
114 applet_long_options = patch_longopts;
115#endif
Denys Vlasenko8b8d32e2010-01-22 05:10:33 +0100116 /* -f,-E,-g are ignored */
117 opt = getopt32(argv, "p:i:RN""fEg:", &p, &i, NULL);
Denys Vlasenkod7874ed2009-08-20 23:33:19 +0200118 if (opt & OPT_R)
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000119 plus = '-';
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000120 patch_level = xatoi(p); /* can be negative! */
121 patch_file = xfopen_stdin(i);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000122 }
123
Denis Vlasenko8ee649a2008-03-26 20:04:27 +0000124 patch_line = xmalloc_fgetline(patch_file);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000125 while (patch_line) {
126 FILE *src_stream;
127 FILE *dst_stream;
Denis Vlasenkocc2965f2008-03-25 14:15:39 +0000128 //char *old_filename;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000129 char *new_filename;
Denys Vlasenko17c838b2009-10-24 17:11:55 +0200130 char *backup_filename = NULL;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000131 unsigned src_cur_line = 1;
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000132 unsigned dst_cur_line = 0;
133 unsigned dst_beg_line;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000134 unsigned bad_hunk_count = 0;
135 unsigned hunk_count = 0;
136 smallint copy_trailing_lines_flag = 0;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000137
138 /* Skip everything upto the "---" marker
139 * No need to parse the lines "Only in <dir>", and "diff <args>"
140 */
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000141 do {
142 /* Extract the filename used before the patch was generated */
Denis Vlasenkocc2965f2008-03-25 14:15:39 +0000143 new_filename = extract_filename(patch_line, patch_level, "--- ");
144 // was old_filename above
Denis Vlasenko8ee649a2008-03-26 20:04:27 +0000145 patch_line = xmalloc_fgetline(patch_file);
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000146 if (!patch_line) goto quit;
Denis Vlasenkocc2965f2008-03-25 14:15:39 +0000147 } while (!new_filename);
148 free(new_filename); // "source" filename is irrelevant
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000149
150 new_filename = extract_filename(patch_line, patch_level, "+++ ");
151 if (!new_filename) {
152 bb_error_msg_and_die("invalid patch");
Glenn L McGrath655d8142003-06-22 15:32:41 +0000153 }
154
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000155 /* Get access rights from the file to be patched */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000156 if (stat(new_filename, &saved_stat) != 0) {
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000157 char *slash = strrchr(new_filename, '/');
158 if (slash) {
159 /* Create leading directories */
160 *slash = '\0';
Glenn L McGrath655d8142003-06-22 15:32:41 +0000161 bb_make_directory(new_filename, -1, FILEUTILS_RECUR);
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000162 *slash = '/';
Glenn L McGrath655d8142003-06-22 15:32:41 +0000163 }
Denis Vlasenkocc2965f2008-03-25 14:15:39 +0000164 src_stream = NULL;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000165 saved_stat.st_mode = 0644;
Denys Vlasenko17c838b2009-10-24 17:11:55 +0200166 } else if (!(opt & OPT_dry_run)) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000167 backup_filename = xasprintf("%s.orig", new_filename);
Denis Vlasenkocb448fe2008-02-17 14:28:53 +0000168 xrename(new_filename, backup_filename);
Denis Vlasenko5415c852008-07-21 23:05:26 +0000169 src_stream = xfopen_for_read(backup_filename);
Denys Vlasenko17c838b2009-10-24 17:11:55 +0200170 } else
171 src_stream = xfopen_for_read(new_filename);
172
173 if (opt & OPT_dry_run) {
174 dst_stream = xfopen_for_write("/dev/null");
175 } else {
176 dst_stream = xfopen_for_write(new_filename);
177 fchmod(fileno(dst_stream), saved_stat.st_mode);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000178 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000179
180 printf("patching file %s\n", new_filename);
181
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000182 /* Handle all hunks for this file */
Denis Vlasenko2d5ca602006-10-12 22:43:20 +0000183 patch_line = xmalloc_fgets(patch_file);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000184 while (patch_line) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000185 unsigned count;
186 unsigned src_beg_line;
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000187 unsigned hunk_offset_start;
188 unsigned src_last_line = 1;
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000189 unsigned dst_last_line = 1;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000190
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000191 if ((sscanf(patch_line, "@@ -%d,%d +%d,%d", &src_beg_line, &src_last_line, &dst_beg_line, &dst_last_line) < 3)
192 && (sscanf(patch_line, "@@ -%d +%d,%d", &src_beg_line, &dst_beg_line, &dst_last_line) < 2)
193 ) {
194 /* No more hunks for this file */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000195 break;
196 }
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000197 if (plus != '+') {
198 /* reverse patch */
199 unsigned tmp = src_last_line;
200 src_last_line = dst_last_line;
201 dst_last_line = tmp;
202 tmp = src_beg_line;
203 src_beg_line = dst_beg_line;
204 dst_beg_line = tmp;
205 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000206 hunk_count++;
207
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000208 if (src_beg_line && dst_beg_line) {
Glenn L McGrath655d8142003-06-22 15:32:41 +0000209 /* Copy unmodified lines upto start of hunk */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000210 /* src_beg_line will be 0 if it's a new file */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000211 count = src_beg_line - src_cur_line;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000212 if (copy_lines(src_stream, dst_stream, count)) {
Denis Vlasenkoe1a0d482006-10-20 13:28:22 +0000213 bb_error_msg_and_die("bad src file");
Glenn L McGrath655d8142003-06-22 15:32:41 +0000214 }
215 src_cur_line += count;
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000216 dst_cur_line += count;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000217 copy_trailing_lines_flag = 1;
218 }
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000219 src_last_line += hunk_offset_start = src_cur_line;
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000220 dst_last_line += dst_cur_line;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000221
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000222 while (1) {
223 free(patch_line);
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000224 patch_line = xmalloc_fgets(patch_file);
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000225 if (patch_line == NULL)
226 break; /* EOF */
Denys Vlasenko17c838b2009-10-24 17:11:55 +0200227 if (!*patch_line) {
228 /* whitespace-damaged patch with "" lines */
229 free(patch_line);
230 patch_line = xstrdup(" ");
231 }
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000232 if ((*patch_line != '-') && (*patch_line != '+')
233 && (*patch_line != ' ')
234 ) {
235 break; /* End of hunk */
236 }
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000237 if (*patch_line != plus) { /* '-' or ' ' */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000238 char *src_line = NULL;
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000239 if (src_cur_line == src_last_line)
240 break;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000241 if (src_stream) {
Denis Vlasenko2d5ca602006-10-12 22:43:20 +0000242 src_line = xmalloc_fgets(src_stream);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000243 if (src_line) {
244 int diff = strcmp(src_line, patch_line + 1);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000245 src_cur_line++;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000246 free(src_line);
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000247 if (diff)
248 src_line = NULL;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000249 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000250 }
Denys Vlasenkod7874ed2009-08-20 23:33:19 +0200251 /* Do not patch an already patched hunk with -N */
252 if (src_line == 0 && (opt & OPT_N)) {
253 continue;
254 }
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000255 if (!src_line) {
256 bb_error_msg("hunk #%u FAILED at %u", hunk_count, hunk_offset_start);
257 bad_hunk_count++;
258 break;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000259 }
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000260 if (*patch_line != ' ') { /* '-' */
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000261 continue;
262 }
Glenn L McGrath655d8142003-06-22 15:32:41 +0000263 }
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000264 if (dst_cur_line == dst_last_line)
265 break;
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000266 fputs(patch_line + 1, dst_stream);
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000267 dst_cur_line++;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000268 } /* end of while loop handling one hunk */
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000269 } /* end of while loop handling one file */
Glenn L McGrath655d8142003-06-22 15:32:41 +0000270
271 /* Cleanup last patched file */
272 if (copy_trailing_lines_flag) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000273 copy_lines(src_stream, dst_stream, (unsigned)(-1));
Glenn L McGrath655d8142003-06-22 15:32:41 +0000274 }
275 if (src_stream) {
276 fclose(src_stream);
277 }
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000278 fclose(dst_stream);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000279 if (bad_hunk_count) {
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000280 ret = 1;
281 bb_error_msg("%u out of %u hunk FAILED", bad_hunk_count, hunk_count);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000282 } else {
283 /* It worked, we can remove the backup */
284 if (backup_filename) {
285 unlink(backup_filename);
286 }
Denys Vlasenko17c838b2009-10-24 17:11:55 +0200287 if (!(opt & OPT_dry_run)
288 && ((dst_cur_line == 0) || (dst_beg_line == 0))
289 ) {
Glenn L McGrath655d8142003-06-22 15:32:41 +0000290 /* The new patched file is empty, remove it */
Denis Vlasenko1bb552b2007-04-05 21:25:15 +0000291 xunlink(new_filename);
Denis Vlasenkocc2965f2008-03-25 14:15:39 +0000292 // /* old_filename and new_filename may be the same file */
293 // unlink(old_filename);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000294 }
295 }
Denis Vlasenkocc2965f2008-03-25 14:15:39 +0000296 free(backup_filename);
297 //free(old_filename);
298 free(new_filename);
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000299 } /* end of "while there are patch lines" */
Denis Vlasenko08ec67b2008-03-26 13:32:30 +0000300 quit:
Eric Andersenc7bda1c2004-03-15 08:29:22 +0000301 /* 0 = SUCCESS
Glenn L McGrath655d8142003-06-22 15:32:41 +0000302 * 1 = Some hunks failed
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000303 * 2 = More serious problems (exited earlier)
Glenn L McGrath655d8142003-06-22 15:32:41 +0000304 */
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000305 return ret;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000306}