blob: 0bde2cab35165dfa7babb67ae64b32514ea4b105 [file] [log] [blame]
Rob Landley1bbc0cd2010-08-13 15:50:26 +02001/* Adapted from toybox's patch. */
Glenn L McGrath655d8142003-06-22 15:32:41 +00002
Rob Landley1bbc0cd2010-08-13 15:50:26 +02003/* vi: set sw=4 ts=4:
4 *
5 * patch.c - Apply a "universal" diff.
6 *
7 * Copyright 2007 Rob Landley <rob@landley.net>
8 *
9 * see http://www.opengroup.org/onlinepubs/009695399/utilities/patch.html
10 * (But only does -u, because who still cares about "ed"?)
11 *
12 * TODO:
13 * -b backup
14 * -l treat all whitespace as a single space
Rob Landley1bbc0cd2010-08-13 15:50:26 +020015 * -d chdir first
16 * -D define wrap #ifdef and #ifndef around changes
17 * -o outfile output here instead of in place
18 * -r rejectfile write rejected hunks to this file
19 *
20 * -E remove empty files --remove-empty-files
21 * -f force (no questions asked)
22 * -F fuzz (number, default 2)
23 * [file] which file to patch
24
25USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
26
27config PATCH
28 bool "patch"
29 default y
30 help
31 usage: patch [-i file] [-p depth] [-Ru]
32
33 Apply a unified diff to one or more files.
34
35 -i Input file (defaults=stdin)
36 -p number of '/' to strip from start of file paths (default=all)
37 -R Reverse patch.
38 -u Ignored (only handles "unified" diffs)
39
40 This version of patch only handles unified diffs, and only modifies
41 a file when all all hunks to that file apply. Patch prints failed
42 hunks to stderr, and exits with nonzero status if any hunks fail.
43
44 A file compared against /dev/null (or with a date <= the epoch) is
45 created/deleted as appropriate.
46*/
Denis Vlasenkob6adbf12007-05-26 19:00:18 +000047#include "libbb.h"
Glenn L McGrath655d8142003-06-22 15:32:41 +000048
Rob Landley1bbc0cd2010-08-13 15:50:26 +020049struct double_list {
50 struct double_list *next;
51 struct double_list *prev;
52 char *data;
53};
54
55// Return the first item from the list, advancing the list (which must be called
56// as &list)
57static
58void *TOY_llist_pop(void *list)
Glenn L McGrath655d8142003-06-22 15:32:41 +000059{
Rob Landley1bbc0cd2010-08-13 15:50:26 +020060 // I'd use a void ** for the argument, and even accept the typecast in all
61 // callers as documentation you need the &, except the stupid compiler
62 // would then scream about type-punned pointers. Screw it.
63 void **llist = (void **)list;
64 void **next = (void **)*llist;
65 *llist = *next;
66
67 return (void *)next;
Glenn L McGrath655d8142003-06-22 15:32:41 +000068}
69
Rob Landley1bbc0cd2010-08-13 15:50:26 +020070// Free all the elements of a linked list
71// if freeit!=NULL call freeit() on each element before freeing it.
72static
73void TOY_llist_free(void *list, void (*freeit)(void *data))
Glenn L McGrath655d8142003-06-22 15:32:41 +000074{
Rob Landley1bbc0cd2010-08-13 15:50:26 +020075 while (list) {
76 void *pop = TOY_llist_pop(&list);
77 if (freeit) freeit(pop);
78 else free(pop);
Glenn L McGrath655d8142003-06-22 15:32:41 +000079
Rob Landley1bbc0cd2010-08-13 15:50:26 +020080 // End doubly linked list too.
81 if (list==pop) break;
Glenn L McGrath655d8142003-06-22 15:32:41 +000082 }
Glenn L McGrath655d8142003-06-22 15:32:41 +000083}
Denys Vlasenko6373bb72010-08-13 16:41:15 +020084//Override bbox's names
85#define llist_pop TOY_llist_pop
86#define llist_free TOY_llist_free
Glenn L McGrath655d8142003-06-22 15:32:41 +000087
Rob Landley1bbc0cd2010-08-13 15:50:26 +020088// Add an entry to the end off a doubly linked list
89static
90struct double_list *dlist_add(struct double_list **list, char *data)
91{
92 struct double_list *line = xmalloc(sizeof(struct double_list));
93
94 line->data = data;
95 if (*list) {
96 line->next = *list;
97 line->prev = (*list)->prev;
98 (*list)->prev->next = line;
99 (*list)->prev = line;
100 } else *list = line->next = line->prev = line;
101
102 return line;
103}
104
105// Ensure entire path exists.
106// If mode != -1 set permissions on newly created dirs.
107// Requires that path string be writable (for temporary null terminators).
108static
109void xmkpath(char *path, int mode)
110{
111 char *p, old;
112 mode_t mask;
113 int rc;
114 struct stat st;
115
116 for (p = path; ; p++) {
117 if (!*p || *p == '/') {
118 old = *p;
119 *p = rc = 0;
120 if (stat(path, &st) || !S_ISDIR(st.st_mode)) {
121 if (mode != -1) {
122 mask = umask(0);
123 rc = mkdir(path, mode);
124 umask(mask);
125 } else rc = mkdir(path, 0777);
126 }
127 *p = old;
128 if(rc) bb_perror_msg_and_die("mkpath '%s'", path);
129 }
130 if (!*p) break;
131 }
132}
133
134// Slow, but small.
135static
136char *get_rawline(int fd, long *plen, char end)
137{
138 char c, *buf = NULL;
139 long len = 0;
140
141 for (;;) {
142 if (1>read(fd, &c, 1)) break;
143 if (!(len & 63)) buf=xrealloc(buf, len+65);
144 if ((buf[len++]=c) == end) break;
145 }
146 if (buf) buf[len]=0;
147 if (plen) *plen = len;
148
149 return buf;
150}
151
152static
153char *get_line(int fd)
154{
155 long len;
156 char *buf = get_rawline(fd, &len, '\n');
157
158 if (buf && buf[--len]=='\n') buf[len]=0;
159
160 return buf;
161}
162
163// Copy the rest of in to out and close both files.
164static
165void xsendfile(int in, int out)
166{
167 long len;
168 char buf[4096];
169
170 if (in<0) return;
171 for (;;) {
172 len = safe_read(in, buf, 4096);
173 if (len<1) break;
174 xwrite(out, buf, len);
175 }
176}
177
178// Copy the rest of the data and replace the original with the copy.
179static
180void replace_tempfile(int fdin, int fdout, char **tempname)
181{
182 char *temp = xstrdup(*tempname);
183
184 temp[strlen(temp)-6]=0;
185 if (fdin != -1) {
186 xsendfile(fdin, fdout);
187 xclose(fdin);
188 }
189 xclose(fdout);
190 rename(*tempname, temp);
191 free(*tempname);
192 free(temp);
193 *tempname = NULL;
194}
195
196// Open a temporary file to copy an existing file into.
197static
198int copy_tempfile(int fdin, char *name, char **tempname)
199{
200 struct stat statbuf;
201 int fd;
202
203 *tempname = xasprintf("%sXXXXXX", name);
204 fd = mkstemp(*tempname);
205 if(-1 == fd) bb_perror_msg_and_die("no temp file");
206
207 // Set permissions of output file
208 fstat(fdin, &statbuf);
209 fchmod(fd, statbuf.st_mode);
210
211 return fd;
212}
213
214// Abort the copy and delete the temporary file.
215static
216void delete_tempfile(int fdin, int fdout, char **tempname)
217{
218 close(fdin);
219 close(fdout);
220 unlink(*tempname);
221 free(*tempname);
222 *tempname = NULL;
223}
224
225
226
227struct globals {
228 char *infile;
229 long prefix;
230
231 struct double_list *current_hunk;
Rob Landley760d0eb2010-08-13 16:40:21 +0200232 long oldline, oldlen, newline, newlen;
233 long linenum;
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200234 int context, state, filein, fileout, filepatch, hunknum;
235 char *tempname;
236
237 // was toys.foo:
238 int exitval;
239};
240#define TT (*ptr_to_globals)
241#define INIT_TT() do { \
242 SET_PTR_TO_GLOBALS(xzalloc(sizeof(TT))); \
243} while (0)
244
245
Denys Vlasenkoa4160e12010-08-16 01:33:57 +0200246#define FLAG_STR "Rup:i:Nx"
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200247/* FLAG_REVERSE must be == 1! Code uses this fact. */
248#define FLAG_REVERSE (1 << 0)
249#define FLAG_u (1 << 1)
250#define FLAG_PATHLEN (1 << 2)
251#define FLAG_INPUT (1 << 3)
Denys Vlasenkoa4160e12010-08-16 01:33:57 +0200252#define FLAG_IGNORE (1 << 4)
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200253//non-standard:
Denys Vlasenkoa4160e12010-08-16 01:33:57 +0200254#define FLAG_DEBUG (1 << 5)
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200255
256// Dispose of a line of input, either by writing it out or discarding it.
257
258// state < 2: just free
259// state = 2: write whole line to stderr
260// state = 3: write whole line to fileout
261// state > 3: write line+1 to fileout when *line != state
262
263#define PATCH_DEBUG (option_mask32 & FLAG_DEBUG)
264
265static void do_line(void *data)
266{
267 struct double_list *dlist = (struct double_list *)data;
268
269 if (TT.state>1 && *dlist->data != TT.state)
270 fdprintf(TT.state == 2 ? 2 : TT.fileout,
271 "%s\n", dlist->data+(TT.state>3 ? 1 : 0));
272
273 if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
274
275 free(dlist->data);
276 free(data);
277}
278
279static void finish_oldfile(void)
280{
281 if (TT.tempname) replace_tempfile(TT.filein, TT.fileout, &TT.tempname);
282 TT.fileout = TT.filein = -1;
283}
284
285static void fail_hunk(void)
286{
287 if (!TT.current_hunk) return;
288 TT.current_hunk->prev->next = 0;
289
290 fdprintf(2, "Hunk %d FAILED %ld/%ld.\n", TT.hunknum, TT.oldline, TT.newline);
291 TT.exitval = 1;
292
293 // If we got to this point, we've seeked to the end. Discard changes to
294 // this file and advance to next file.
295
296 TT.state = 2;
Denys Vlasenko6373bb72010-08-13 16:41:15 +0200297 llist_free(TT.current_hunk, do_line);
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200298 TT.current_hunk = NULL;
299 delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
300 TT.state = 0;
301}
302
303// Given a hunk of a unified diff, make the appropriate change to the file.
304// This does not use the location information, but instead treats a hunk
305// as a sort of regex. Copies data from input to output until it finds
306// the change to be made, then outputs the changed data and returns.
307// (Finding EOF first is an error.) This is a single pass operation, so
308// multiple hunks must occur in order in the file.
309
310static int apply_one_hunk(void)
311{
312 struct double_list *plist, *buf = NULL, *check;
313 int matcheof = 0, reverse = option_mask32 & FLAG_REVERSE, backwarn = 0;
Denys Vlasenkocda81592010-08-17 01:31:40 +0200314 /* Do we try "dummy" revert to check whether
315 * to silently skip this hunk? Used to implement -N.
316 */
317 int dummy_revert = 0;
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200318
319 // Break doubly linked list so we can use singly linked traversal function.
320 TT.current_hunk->prev->next = NULL;
321
322 // Match EOF if there aren't as many ending context lines as beginning
323 for (plist = TT.current_hunk; plist; plist = plist->next) {
324 if (plist->data[0]==' ') matcheof++;
325 else matcheof = 0;
326 if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
327 }
328 matcheof = matcheof < TT.context;
329
330 if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
331
332 // Loop through input data searching for this hunk. Match all context
333 // lines and all lines to be removed until we've found the end of a
334 // complete hunk.
335 plist = TT.current_hunk;
336 buf = NULL;
337 if (TT.context) for (;;) {
338 char *data = get_line(TT.filein);
339
340 TT.linenum++;
341
342 // Figure out which line of hunk to compare with next. (Skip lines
343 // of the hunk we'd be adding.)
344 while (plist && *plist->data == "+-"[reverse]) {
345 if (data && !strcmp(data, plist->data+1)) {
346 if (!backwarn) {
Rob Landley9d113ca2010-10-04 00:49:48 +0200347 backwarn = TT.linenum;
Denys Vlasenkocda81592010-08-17 01:31:40 +0200348 if (option_mask32 & FLAG_IGNORE) {
349 dummy_revert = 1;
350 reverse ^= 1;
351 continue;
352 }
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200353 }
354 }
355 plist = plist->next;
356 }
357
358 // Is this EOF?
359 if (!data) {
360 if (PATCH_DEBUG) fdprintf(2, "INEOF\n");
361
362 // Does this hunk need to match EOF?
363 if (!plist && matcheof) break;
364
Rob Landley9d113ca2010-10-04 00:49:48 +0200365 if (backwarn)
366 fdprintf(2,"Possibly reversed hunk %d at %ld\n",
367 TT.hunknum, TT.linenum);
368
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200369 // File ended before we found a place for this hunk.
370 fail_hunk();
371 goto done;
372 } else if (PATCH_DEBUG) fdprintf(2, "IN: %s\n", data);
373 check = dlist_add(&buf, data);
374
375 // Compare this line with next expected line of hunk.
376 // todo: teach the strcmp() to ignore whitespace.
377
378 // A match can fail because the next line doesn't match, or because
379 // we hit the end of a hunk that needed EOF, and this isn't EOF.
380
381 // If match failed, flush first line of buffered data and
382 // recheck buffered data for a new match until we find one or run
383 // out of buffer.
384
385 for (;;) {
386 if (!plist || strcmp(check->data, plist->data+1)) {
387 // Match failed. Write out first line of buffered data and
388 // recheck remaining buffered data for a new match.
389
390 if (PATCH_DEBUG)
391 fdprintf(2, "NOT: %s\n", plist->data);
392
393 TT.state = 3;
Denys Vlasenko6373bb72010-08-13 16:41:15 +0200394 check = llist_pop(&buf);
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200395 check->prev->next = buf;
396 buf->prev = check->prev;
397 do_line(check);
398 plist = TT.current_hunk;
399
400 // If we've reached the end of the buffer without confirming a
401 // match, read more lines.
402 if (check==buf) {
403 buf = 0;
404 break;
405 }
406 check = buf;
407 } else {
408 if (PATCH_DEBUG)
409 fdprintf(2, "MAYBE: %s\n", plist->data);
410 // This line matches. Advance plist, detect successful match.
411 plist = plist->next;
412 if (!plist && !matcheof) goto out;
413 check = check->next;
414 if (check == buf) break;
415 }
416 }
417 }
418out:
419 // We have a match. Emit changed data.
Denys Vlasenkocda81592010-08-17 01:31:40 +0200420 TT.state = "-+"[reverse ^ dummy_revert];
Denys Vlasenko6373bb72010-08-13 16:41:15 +0200421 llist_free(TT.current_hunk, do_line);
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200422 TT.current_hunk = NULL;
423 TT.state = 1;
424done:
425 if (buf) {
426 buf->prev->next = NULL;
Denys Vlasenko6373bb72010-08-13 16:41:15 +0200427 llist_free(buf, do_line);
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200428 }
429
430 return TT.state;
431}
432
433// Read a patch file and find hunks, opening/creating/deleting files.
434// Call apply_one_hunk() on each hunk.
435
436// state 0: Not in a hunk, look for +++.
437// state 1: Found +++ file indicator, look for @@
438// state 2: In hunk: counting initial context lines
439// state 3: In hunk: getting body
440
Denis Vlasenko9b49a5e2007-10-11 10:05:36 +0000441int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
Denis Vlasenkoa60f84e2008-07-05 09:18:54 +0000442int patch_main(int argc UNUSED_PARAM, char **argv)
Glenn L McGrath655d8142003-06-22 15:32:41 +0000443{
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200444 int opts;
445 int reverse, state = 0;
446 char *oldname = NULL, *newname = NULL;
447 char *opt_p, *opt_i;
Denis Vlasenkoc93b1622008-03-23 22:55:25 +0000448
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200449 INIT_TT();
450
451 opts = getopt32(argv, FLAG_STR, &opt_p, &opt_i);
Denys Vlasenkoe7b0a9e2010-08-22 05:39:15 +0200452 argv += optind;
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200453 reverse = opts & FLAG_REVERSE;
454 TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200455 TT.filein = TT.fileout = -1;
Denys Vlasenkoe7b0a9e2010-08-22 05:39:15 +0200456 if (opts & FLAG_INPUT) {
457 TT.filepatch = xopen_stdin(opt_i);
458 } else {
459 if (argv[0] && argv[1]) {
460 TT.filepatch = xopen_stdin(argv[1]);
461 }
462 }
463 if (argv[0]) {
464 oldname = xstrdup(argv[0]);
465 newname = xstrdup(argv[0]);
466 }
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200467
468 // Loop through the lines in the patch
469 for(;;) {
470 char *patchline;
471
472 patchline = get_line(TT.filepatch);
473 if (!patchline) break;
474
475 // Other versions of patch accept damaged patches,
476 // so we need to also.
477 if (!*patchline) {
478 free(patchline);
479 patchline = xstrdup(" ");
480 }
481
482 // Are we assembling a hunk?
483 if (state >= 2) {
484 if (*patchline==' ' || *patchline=='+' || *patchline=='-') {
485 dlist_add(&TT.current_hunk, patchline);
486
487 if (*patchline != '+') TT.oldlen--;
488 if (*patchline != '-') TT.newlen--;
489
490 // Context line?
491 if (*patchline==' ' && state==2) TT.context++;
492 else state=3;
493
494 // If we've consumed all expected hunk lines, apply the hunk.
495
496 if (!TT.oldlen && !TT.newlen) state = apply_one_hunk();
497 continue;
498 }
499 fail_hunk();
500 state = 0;
501 continue;
502 }
503
504 // Open a new file?
505 if (!strncmp("--- ", patchline, 4) || !strncmp("+++ ", patchline, 4)) {
506 char *s, **name = reverse ? &newname : &oldname;
507 int i;
508
509 if (*patchline == '+') {
510 name = reverse ? &oldname : &newname;
511 state = 1;
512 }
513
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200514 finish_oldfile();
515
Denys Vlasenkoe7b0a9e2010-08-22 05:39:15 +0200516 if (!argv[0]) {
517 free(*name);
518 // Trim date from end of filename (if any). We don't care.
519 for (s = patchline+4; *s && *s!='\t'; s++)
520 if (*s=='\\' && s[1]) s++;
521 i = atoi(s);
522 if (i>1900 && i<=1970)
523 *name = xstrdup("/dev/null");
524 else {
525 *s = 0;
526 *name = xstrdup(patchline+4);
527 }
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200528 }
529
530 // We defer actually opening the file because svn produces broken
531 // patches that don't signal they want to create a new file the
532 // way the patch man page says, so you have to read the first hunk
533 // and _guess_.
534
Rob Landley760d0eb2010-08-13 16:40:21 +0200535 // Start a new hunk? Usually @@ -oldline,oldlen +newline,newlen @@
536 // but a missing ,value means the value is 1.
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200537 } else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
538 int i;
Rob Landley760d0eb2010-08-13 16:40:21 +0200539 char *s = patchline+4;
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200540
Rob Landley760d0eb2010-08-13 16:40:21 +0200541 // Read oldline[,oldlen] +newline[,newlen]
542
543 TT.oldlen = TT.newlen = 1;
544 TT.oldline = strtol(s, &s, 10);
545 if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
546 TT.newline = strtol(s+2, &s, 10);
547 if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200548
549 TT.context = 0;
550 state = 2;
551
552 // If this is the first hunk, open the file.
553 if (TT.filein == -1) {
554 int oldsum, newsum, del = 0;
Rob Landley760d0eb2010-08-13 16:40:21 +0200555 char *name;
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200556
557 oldsum = TT.oldline + TT.oldlen;
558 newsum = TT.newline + TT.newlen;
559
560 name = reverse ? oldname : newname;
561
562 // We're deleting oldname if new file is /dev/null (before -p)
563 // or if new hunk is empty (zero context) after patching
564 if (!strcmp(name, "/dev/null") || !(reverse ? oldsum : newsum))
565 {
566 name = reverse ? newname : oldname;
567 del++;
568 }
569
570 // handle -p path truncation.
571 for (i=0, s = name; *s;) {
572 if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break;
573 if (*(s++)=='/') {
574 name = s;
575 i++;
576 }
577 }
578
579 if (del) {
580 printf("removing %s\n", name);
581 xunlink(name);
582 state = 0;
583 // If we've got a file to open, do so.
584 } else if (!(option_mask32 & FLAG_PATHLEN) || i <= TT.prefix) {
585 // If the old file was null, we're creating a new one.
586 if (!strcmp(oldname, "/dev/null") || !oldsum) {
587 printf("creating %s\n", name);
588 s = strrchr(name, '/');
589 if (s) {
590 *s = 0;
591 xmkpath(name, -1);
592 *s = '/';
593 }
594 TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
595 } else {
596 printf("patching file %s\n", name);
Rob Landley9d113ca2010-10-04 00:49:48 +0200597 TT.filein = xopen(name, O_RDONLY);
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200598 }
599 TT.fileout = copy_tempfile(TT.filein, name, &TT.tempname);
600 TT.linenum = 0;
601 TT.hunknum = 0;
602 }
603 }
604
605 TT.hunknum++;
606
607 continue;
608 }
609
610 // If we didn't continue above, discard this line.
611 free(patchline);
Glenn L McGrath655d8142003-06-22 15:32:41 +0000612 }
613
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200614 finish_oldfile();
Glenn L McGrath655d8142003-06-22 15:32:41 +0000615
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200616 if (ENABLE_FEATURE_CLEAN_UP) {
617 close(TT.filepatch);
618 free(oldname);
619 free(newname);
620 }
Denis Vlasenko64a76d72008-03-24 18:18:03 +0000621
Rob Landley1bbc0cd2010-08-13 15:50:26 +0200622 return TT.exitval;
Glenn L McGrath655d8142003-06-22 15:32:41 +0000623}