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
15 * -N ignore already applied
17 * -D define wrap #ifdef and #ifndef around changes
18 * -o outfile output here instead of in place
19 * -r rejectfile write rejected hunks to this file
21 * -E remove empty files --remove-empty-files
22 * -f force (no questions asked)
23 * -F fuzz (number, default 2)
24 * [file] which file to patch
26 USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
32 usage: patch [-i file] [-p depth] [-Ru]
34 Apply a unified diff to one or more files.
36 -i Input file (defaults=stdin)
37 -p number of '/' to strip from start of file paths (default=all)
39 -u Ignored (only handles "unified" diffs)
41 This version of patch only handles unified diffs, and only modifies
42 a file when all all hunks to that file apply. Patch prints failed
43 hunks to stderr, and exits with nonzero status if any hunks fail.
45 A file compared against /dev/null (or with a date <= the epoch) is
46 created/deleted as appropriate.
51 struct double_list *next;
52 struct double_list *prev;
56 // Return the first item from the list, advancing the list (which must be called
59 void *TOY_llist_pop(void *list)
61 // I'd use a void ** for the argument, and even accept the typecast in all
62 // callers as documentation you need the &, except the stupid compiler
63 // would then scream about type-punned pointers. Screw it.
64 void **llist = (void **)list;
65 void **next = (void **)*llist;
71 // Free all the elements of a linked list
72 // if freeit!=NULL call freeit() on each element before freeing it.
74 void TOY_llist_free(void *list, void (*freeit)(void *data))
77 void *pop = TOY_llist_pop(&list);
78 if (freeit) freeit(pop);
81 // End doubly linked list too.
85 //Override bbox's names
86 #define llist_pop TOY_llist_pop
87 #define llist_free TOY_llist_free
89 // Add an entry to the end off a doubly linked list
91 struct double_list *dlist_add(struct double_list **list, char *data)
93 struct double_list *line = xmalloc(sizeof(struct double_list));
98 line->prev = (*list)->prev;
99 (*list)->prev->next = line;
100 (*list)->prev = line;
101 } else *list = line->next = line->prev = line;
106 // Ensure entire path exists.
107 // If mode != -1 set permissions on newly created dirs.
108 // Requires that path string be writable (for temporary null terminators).
110 void xmkpath(char *path, int mode)
117 for (p = path; ; p++) {
118 if (!*p || *p == '/') {
121 if (stat(path, &st) || !S_ISDIR(st.st_mode)) {
124 rc = mkdir(path, mode);
126 } else rc = mkdir(path, 0777);
129 if(rc) bb_perror_msg_and_die("mkpath '%s'", path);
137 char *get_rawline(int fd, long *plen, char end)
143 if (1>read(fd, &c, 1)) break;
144 if (!(len & 63)) buf=xrealloc(buf, len+65);
145 if ((buf[len++]=c) == end) break;
148 if (plen) *plen = len;
154 char *get_line(int fd)
157 char *buf = get_rawline(fd, &len, '\n');
159 if (buf && buf[--len]=='\n') buf[len]=0;
164 // Copy the rest of in to out and close both files.
166 void xsendfile(int in, int out)
173 len = safe_read(in, buf, 4096);
175 xwrite(out, buf, len);
179 // Copy the rest of the data and replace the original with the copy.
181 void replace_tempfile(int fdin, int fdout, char **tempname)
183 char *temp = xstrdup(*tempname);
185 temp[strlen(temp)-6]=0;
187 xsendfile(fdin, fdout);
191 rename(*tempname, temp);
197 // Open a temporary file to copy an existing file into.
199 int copy_tempfile(int fdin, char *name, char **tempname)
204 *tempname = xasprintf("%sXXXXXX", name);
205 fd = mkstemp(*tempname);
206 if(-1 == fd) bb_perror_msg_and_die("no temp file");
208 // Set permissions of output file
209 fstat(fdin, &statbuf);
210 fchmod(fd, statbuf.st_mode);
215 // Abort the copy and delete the temporary file.
217 void delete_tempfile(int fdin, int fdout, char **tempname)
232 struct double_list *current_hunk;
233 long oldline, oldlen, newline, newlen;
235 int context, state, filein, fileout, filepatch, hunknum;
241 #define TT (*ptr_to_globals)
242 #define INIT_TT() do { \
243 SET_PTR_TO_GLOBALS(xzalloc(sizeof(TT))); \
248 #define FLAG_STR "Rup:i:x"
249 /* FLAG_REVERSE must be == 1! Code uses this fact. */
250 #define FLAG_REVERSE (1 << 0)
251 #define FLAG_u (1 << 1)
252 #define FLAG_PATHLEN (1 << 2)
253 #define FLAG_INPUT (1 << 3)
255 #define FLAG_DEBUG (1 << 4)
257 // Dispose of a line of input, either by writing it out or discarding it.
259 // state < 2: just free
260 // state = 2: write whole line to stderr
261 // state = 3: write whole line to fileout
262 // state > 3: write line+1 to fileout when *line != state
264 #define PATCH_DEBUG (option_mask32 & FLAG_DEBUG)
266 static void do_line(void *data)
268 struct double_list *dlist = (struct double_list *)data;
270 if (TT.state>1 && *dlist->data != TT.state)
271 fdprintf(TT.state == 2 ? 2 : TT.fileout,
272 "%s\n", dlist->data+(TT.state>3 ? 1 : 0));
274 if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
280 static void finish_oldfile(void)
282 if (TT.tempname) replace_tempfile(TT.filein, TT.fileout, &TT.tempname);
283 TT.fileout = TT.filein = -1;
286 static void fail_hunk(void)
288 if (!TT.current_hunk) return;
289 TT.current_hunk->prev->next = 0;
291 fdprintf(2, "Hunk %d FAILED %ld/%ld.\n", TT.hunknum, TT.oldline, TT.newline);
294 // If we got to this point, we've seeked to the end. Discard changes to
295 // this file and advance to next file.
298 llist_free(TT.current_hunk, do_line);
299 TT.current_hunk = NULL;
300 delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
304 // Given a hunk of a unified diff, make the appropriate change to the file.
305 // This does not use the location information, but instead treats a hunk
306 // as a sort of regex. Copies data from input to output until it finds
307 // the change to be made, then outputs the changed data and returns.
308 // (Finding EOF first is an error.) This is a single pass operation, so
309 // multiple hunks must occur in order in the file.
311 static int apply_one_hunk(void)
313 struct double_list *plist, *buf = NULL, *check;
314 int matcheof = 0, reverse = option_mask32 & FLAG_REVERSE, backwarn = 0;
316 // Break doubly linked list so we can use singly linked traversal function.
317 TT.current_hunk->prev->next = NULL;
319 // Match EOF if there aren't as many ending context lines as beginning
320 for (plist = TT.current_hunk; plist; plist = plist->next) {
321 if (plist->data[0]==' ') matcheof++;
323 if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
325 matcheof = matcheof < TT.context;
327 if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
329 // Loop through input data searching for this hunk. Match all context
330 // lines and all lines to be removed until we've found the end of a
332 plist = TT.current_hunk;
334 if (TT.context) for (;;) {
335 char *data = get_line(TT.filein);
339 // Figure out which line of hunk to compare with next. (Skip lines
340 // of the hunk we'd be adding.)
341 while (plist && *plist->data == "+-"[reverse]) {
342 if (data && !strcmp(data, plist->data+1)) {
344 fdprintf(2,"Possibly reversed hunk %d at %ld\n",
345 TT.hunknum, TT.linenum);
354 if (PATCH_DEBUG) fdprintf(2, "INEOF\n");
356 // Does this hunk need to match EOF?
357 if (!plist && matcheof) break;
359 // File ended before we found a place for this hunk.
362 } else if (PATCH_DEBUG) fdprintf(2, "IN: %s\n", data);
363 check = dlist_add(&buf, data);
365 // Compare this line with next expected line of hunk.
366 // todo: teach the strcmp() to ignore whitespace.
368 // A match can fail because the next line doesn't match, or because
369 // we hit the end of a hunk that needed EOF, and this isn't EOF.
371 // If match failed, flush first line of buffered data and
372 // recheck buffered data for a new match until we find one or run
376 if (!plist || strcmp(check->data, plist->data+1)) {
377 // Match failed. Write out first line of buffered data and
378 // recheck remaining buffered data for a new match.
381 fdprintf(2, "NOT: %s\n", plist->data);
384 check = llist_pop(&buf);
385 check->prev->next = buf;
386 buf->prev = check->prev;
388 plist = TT.current_hunk;
390 // If we've reached the end of the buffer without confirming a
391 // match, read more lines.
399 fdprintf(2, "MAYBE: %s\n", plist->data);
400 // This line matches. Advance plist, detect successful match.
402 if (!plist && !matcheof) goto out;
404 if (check == buf) break;
409 // We have a match. Emit changed data.
410 TT.state = "-+"[reverse];
411 llist_free(TT.current_hunk, do_line);
412 TT.current_hunk = NULL;
416 buf->prev->next = NULL;
417 llist_free(buf, do_line);
423 // Read a patch file and find hunks, opening/creating/deleting files.
424 // Call apply_one_hunk() on each hunk.
426 // state 0: Not in a hunk, look for +++.
427 // state 1: Found +++ file indicator, look for @@
428 // state 2: In hunk: counting initial context lines
429 // state 3: In hunk: getting body
431 int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
432 int patch_main(int argc UNUSED_PARAM, char **argv)
435 int reverse, state = 0;
436 char *oldname = NULL, *newname = NULL;
441 opts = getopt32(argv, FLAG_STR, &opt_p, &opt_i);
442 reverse = opts & FLAG_REVERSE;
443 TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
444 if (opts & FLAG_INPUT) TT.filepatch = xopen(opt_i, O_RDONLY);
445 TT.filein = TT.fileout = -1;
447 // Loop through the lines in the patch
451 patchline = get_line(TT.filepatch);
452 if (!patchline) break;
454 // Other versions of patch accept damaged patches,
455 // so we need to also.
458 patchline = xstrdup(" ");
461 // Are we assembling a hunk?
463 if (*patchline==' ' || *patchline=='+' || *patchline=='-') {
464 dlist_add(&TT.current_hunk, patchline);
466 if (*patchline != '+') TT.oldlen--;
467 if (*patchline != '-') TT.newlen--;
470 if (*patchline==' ' && state==2) TT.context++;
473 // If we've consumed all expected hunk lines, apply the hunk.
475 if (!TT.oldlen && !TT.newlen) state = apply_one_hunk();
484 if (!strncmp("--- ", patchline, 4) || !strncmp("+++ ", patchline, 4)) {
485 char *s, **name = reverse ? &newname : &oldname;
488 if (*patchline == '+') {
489 name = reverse ? &oldname : &newname;
496 // Trim date from end of filename (if any). We don't care.
497 for (s = patchline+4; *s && *s!='\t'; s++)
498 if (*s=='\\' && s[1]) s++;
500 if (i>1900 && i<=1970)
501 *name = xstrdup("/dev/null");
504 *name = xstrdup(patchline+4);
507 // We defer actually opening the file because svn produces broken
508 // patches that don't signal they want to create a new file the
509 // way the patch man page says, so you have to read the first hunk
512 // Start a new hunk? Usually @@ -oldline,oldlen +newline,newlen @@
513 // but a missing ,value means the value is 1.
514 } else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
516 char *s = patchline+4;
518 // Read oldline[,oldlen] +newline[,newlen]
520 TT.oldlen = TT.newlen = 1;
521 TT.oldline = strtol(s, &s, 10);
522 if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
523 TT.newline = strtol(s+2, &s, 10);
524 if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
529 // If this is the first hunk, open the file.
530 if (TT.filein == -1) {
531 int oldsum, newsum, del = 0;
534 oldsum = TT.oldline + TT.oldlen;
535 newsum = TT.newline + TT.newlen;
537 name = reverse ? oldname : newname;
539 // We're deleting oldname if new file is /dev/null (before -p)
540 // or if new hunk is empty (zero context) after patching
541 if (!strcmp(name, "/dev/null") || !(reverse ? oldsum : newsum))
543 name = reverse ? newname : oldname;
547 // handle -p path truncation.
548 for (i=0, s = name; *s;) {
549 if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break;
557 printf("removing %s\n", name);
560 // If we've got a file to open, do so.
561 } else if (!(option_mask32 & FLAG_PATHLEN) || i <= TT.prefix) {
562 // If the old file was null, we're creating a new one.
563 if (!strcmp(oldname, "/dev/null") || !oldsum) {
564 printf("creating %s\n", name);
565 s = strrchr(name, '/');
571 TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
573 printf("patching file %s\n", name);
574 TT.filein = xopen(name, O_RDWR);
576 TT.fileout = copy_tempfile(TT.filein, name, &TT.tempname);
587 // If we didn't continue above, discard this line.
593 if (ENABLE_FEATURE_CLEAN_UP) {