1 /* Adapted from toybox's patch. */
5 * patch.c - Apply a "universal" diff.
7 * Copyright 2007 Rob Landley <rob@landley.net>
9 * see http://www.opengroup.org/onlinepubs/009695399/utilities/patch.html
10 * (But only does -u, because who still cares about "ed"?)
14 * -l treat all whitespace as a single space
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
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
25 USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
31 usage: patch [-i file] [-p depth] [-Ru]
33 Apply a unified diff to one or more files.
35 -i Input file (defaults=stdin)
36 -p number of '/' to strip from start of file paths (default=all)
38 -u Ignored (only handles "unified" diffs)
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.
44 A file compared against /dev/null (or with a date <= the epoch) is
45 created/deleted as appropriate.
50 struct double_list *next;
51 struct double_list *prev;
55 // Return the first item from the list, advancing the list (which must be called
58 void *TOY_llist_pop(void *list)
60 // 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;
70 // Free all the elements of a linked list
71 // if freeit!=NULL call freeit() on each element before freeing it.
73 void TOY_llist_free(void *list, void (*freeit)(void *data))
76 void *pop = TOY_llist_pop(&list);
77 if (freeit) freeit(pop);
80 // End doubly linked list too.
84 //Override bbox's names
85 #define llist_pop TOY_llist_pop
86 #define llist_free TOY_llist_free
88 // Add an entry to the end off a doubly linked list
90 struct double_list *dlist_add(struct double_list **list, char *data)
92 struct double_list *line = xmalloc(sizeof(struct double_list));
97 line->prev = (*list)->prev;
98 (*list)->prev->next = line;
100 } else *list = line->next = line->prev = line;
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).
109 void xmkpath(char *path, int mode)
116 for (p = path; ; p++) {
117 if (!*p || *p == '/') {
120 if (stat(path, &st) || !S_ISDIR(st.st_mode)) {
123 rc = mkdir(path, mode);
125 } else rc = mkdir(path, 0777);
128 if(rc) bb_perror_msg_and_die("mkpath '%s'", path);
136 char *get_rawline(int fd, long *plen, char end)
142 if (1>read(fd, &c, 1)) break;
143 if (!(len & 63)) buf=xrealloc(buf, len+65);
144 if ((buf[len++]=c) == end) break;
147 if (plen) *plen = len;
153 char *get_line(int fd)
156 char *buf = get_rawline(fd, &len, '\n');
158 if (buf && buf[--len]=='\n') buf[len]=0;
163 // Copy the rest of in to out and close both files.
165 void xsendfile(int in, int out)
172 len = safe_read(in, buf, 4096);
174 xwrite(out, buf, len);
178 // Copy the rest of the data and replace the original with the copy.
180 void replace_tempfile(int fdin, int fdout, char **tempname)
182 char *temp = xstrdup(*tempname);
184 temp[strlen(temp)-6]=0;
186 xsendfile(fdin, fdout);
190 rename(*tempname, temp);
196 // Open a temporary file to copy an existing file into.
198 int copy_tempfile(int fdin, char *name, char **tempname)
203 *tempname = xasprintf("%sXXXXXX", name);
204 fd = mkstemp(*tempname);
205 if(-1 == fd) bb_perror_msg_and_die("no temp file");
207 // Set permissions of output file
208 fstat(fdin, &statbuf);
209 fchmod(fd, statbuf.st_mode);
214 // Abort the copy and delete the temporary file.
216 void delete_tempfile(int fdin, int fdout, char **tempname)
231 struct double_list *current_hunk;
232 long oldline, oldlen, newline, newlen;
234 int context, state, filein, fileout, filepatch, hunknum;
240 #define TT (*ptr_to_globals)
241 #define INIT_TT() do { \
242 SET_PTR_TO_GLOBALS(xzalloc(sizeof(TT))); \
246 #define FLAG_STR "Rup:i:Nx"
247 /* 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)
252 #define FLAG_IGNORE (1 << 4)
254 #define FLAG_DEBUG (1 << 5)
256 // Dispose of a line of input, either by writing it out or discarding it.
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
263 #define PATCH_DEBUG (option_mask32 & FLAG_DEBUG)
265 static void do_line(void *data)
267 struct double_list *dlist = (struct double_list *)data;
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));
273 if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
279 static void finish_oldfile(void)
281 if (TT.tempname) replace_tempfile(TT.filein, TT.fileout, &TT.tempname);
282 TT.fileout = TT.filein = -1;
285 static void fail_hunk(void)
287 if (!TT.current_hunk) return;
288 TT.current_hunk->prev->next = 0;
290 fdprintf(2, "Hunk %d FAILED %ld/%ld.\n", TT.hunknum, TT.oldline, TT.newline);
293 // If we got to this point, we've seeked to the end. Discard changes to
294 // this file and advance to next file.
297 llist_free(TT.current_hunk, do_line);
298 TT.current_hunk = NULL;
299 delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
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.
310 static int apply_one_hunk(void)
312 struct double_list *plist, *buf = NULL, *check;
313 int matcheof = 0, reverse = option_mask32 & FLAG_REVERSE, backwarn = 0;
314 /* Do we try "dummy" revert to check whether
315 * to silently skip this hunk? Used to implement -N.
317 int dummy_revert = 0;
319 // Break doubly linked list so we can use singly linked traversal function.
320 TT.current_hunk->prev->next = NULL;
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++;
326 if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
328 matcheof = matcheof < TT.context;
330 if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
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
335 plist = TT.current_hunk;
337 if (TT.context) for (;;) {
338 char *data = get_line(TT.filein);
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)) {
347 backwarn = TT.linenum;
348 if (option_mask32 & FLAG_IGNORE) {
360 if (PATCH_DEBUG) fdprintf(2, "INEOF\n");
362 // Does this hunk need to match EOF?
363 if (!plist && matcheof) break;
366 fdprintf(2,"Possibly reversed hunk %d at %ld\n",
367 TT.hunknum, TT.linenum);
369 // File ended before we found a place for this hunk.
372 } else if (PATCH_DEBUG) fdprintf(2, "IN: %s\n", data);
373 check = dlist_add(&buf, data);
375 // Compare this line with next expected line of hunk.
376 // todo: teach the strcmp() to ignore whitespace.
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.
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
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.
391 fdprintf(2, "NOT: %s\n", plist->data);
394 check = llist_pop(&buf);
395 check->prev->next = buf;
396 buf->prev = check->prev;
398 plist = TT.current_hunk;
400 // If we've reached the end of the buffer without confirming a
401 // match, read more lines.
409 fdprintf(2, "MAYBE: %s\n", plist->data);
410 // This line matches. Advance plist, detect successful match.
412 if (!plist && !matcheof) goto out;
414 if (check == buf) break;
419 // We have a match. Emit changed data.
420 TT.state = "-+"[reverse ^ dummy_revert];
421 llist_free(TT.current_hunk, do_line);
422 TT.current_hunk = NULL;
426 buf->prev->next = NULL;
427 llist_free(buf, do_line);
433 // Read a patch file and find hunks, opening/creating/deleting files.
434 // Call apply_one_hunk() on each hunk.
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
441 int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
442 int patch_main(int argc UNUSED_PARAM, char **argv)
445 int reverse, state = 0;
446 char *oldname = NULL, *newname = NULL;
451 opts = getopt32(argv, FLAG_STR, &opt_p, &opt_i);
453 reverse = opts & FLAG_REVERSE;
454 TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
455 TT.filein = TT.fileout = -1;
456 if (opts & FLAG_INPUT) {
457 TT.filepatch = xopen_stdin(opt_i);
459 if (argv[0] && argv[1]) {
460 TT.filepatch = xopen_stdin(argv[1]);
464 oldname = xstrdup(argv[0]);
465 newname = xstrdup(argv[0]);
468 // Loop through the lines in the patch
472 patchline = get_line(TT.filepatch);
473 if (!patchline) break;
475 // Other versions of patch accept damaged patches,
476 // so we need to also.
479 patchline = xstrdup(" ");
482 // Are we assembling a hunk?
484 if (*patchline==' ' || *patchline=='+' || *patchline=='-') {
485 dlist_add(&TT.current_hunk, patchline);
487 if (*patchline != '+') TT.oldlen--;
488 if (*patchline != '-') TT.newlen--;
491 if (*patchline==' ' && state==2) TT.context++;
494 // If we've consumed all expected hunk lines, apply the hunk.
496 if (!TT.oldlen && !TT.newlen) state = apply_one_hunk();
505 if (!strncmp("--- ", patchline, 4) || !strncmp("+++ ", patchline, 4)) {
506 char *s, **name = reverse ? &newname : &oldname;
509 if (*patchline == '+') {
510 name = reverse ? &oldname : &newname;
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++;
522 if (i>1900 && i<=1970)
523 *name = xstrdup("/dev/null");
526 *name = xstrdup(patchline+4);
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
535 // Start a new hunk? Usually @@ -oldline,oldlen +newline,newlen @@
536 // but a missing ,value means the value is 1.
537 } else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
539 char *s = patchline+4;
541 // Read oldline[,oldlen] +newline[,newlen]
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);
552 // If this is the first hunk, open the file.
553 if (TT.filein == -1) {
554 int oldsum, newsum, del = 0;
557 oldsum = TT.oldline + TT.oldlen;
558 newsum = TT.newline + TT.newlen;
560 name = reverse ? oldname : newname;
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))
566 name = reverse ? newname : oldname;
570 // handle -p path truncation.
571 for (i=0, s = name; *s;) {
572 if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break;
580 printf("removing %s\n", name);
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, '/');
594 TT.filein = xopen(name, O_CREAT|O_EXCL|O_RDWR);
596 printf("patching file %s\n", name);
597 TT.filein = xopen(name, O_RDONLY);
599 TT.fileout = copy_tempfile(TT.filein, name, &TT.tempname);
610 // If we didn't continue above, discard this line.
616 if (ENABLE_FEATURE_CLEAN_UP) {