Annotation of src/usr.bin/patch/patch.c, Revision 1.37
1.37 ! otto 1: /* $OpenBSD: patch.c,v 1.36 2003/08/10 18:39:43 otto Exp $ */
1.2 niklas 2:
1.20 deraadt 3: /*
4: * patch - a program to apply diffs to original files
5: *
1.1 deraadt 6: * Copyright 1986, Larry Wall
1.20 deraadt 7: *
1.14 niklas 8: * Redistribution and use in source and binary forms, with or without
1.20 deraadt 9: * modification, are permitted provided that the following condition is met:
10: * 1. Redistributions of source code must retain the above copyright notice,
11: * this condition and the following disclaimer.
12: *
13: * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
14: * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15: * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16: * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
17: * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18: * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19: * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20: * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1.14 niklas 21: * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22: * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23: * SUCH DAMAGE.
1.20 deraadt 24: *
25: * -C option added in 1998, original code by Marc Espie, based on FreeBSD
26: * behaviour
1.1 deraadt 27: */
28:
29: #ifndef lint
1.37 ! otto 30: static const char rcsid[] = "$OpenBSD: patch.c,v 1.36 2003/08/10 18:39:43 otto Exp $";
1.1 deraadt 31: #endif /* not lint */
32:
1.23 otto 33: #include <sys/types.h>
34: #include <sys/stat.h>
35: #include <unistd.h>
36:
37: #include <ctype.h>
1.24 millert 38: #include <getopt.h>
1.25 millert 39: #include <limits.h>
1.29 otto 40: #include <stdio.h>
1.23 otto 41: #include <string.h>
42: #include <stdlib.h>
43:
1.1 deraadt 44: #include "common.h"
45: #include "util.h"
46: #include "pch.h"
47: #include "inp.h"
48: #include "backupfile.h"
1.31 millert 49: #include "pathnames.h"
1.1 deraadt 50:
1.30 deraadt 51: int filemode = 0644;
1.29 otto 52:
53: char buf[MAXLINELEN]; /* general purpose buffer */
54:
1.35 otto 55: bool using_plan_a = true; /* try to keep everything in memory */
56: bool out_of_mem = false; /* ran out of memory in plan a */
1.29 otto 57:
58: #define MAXFILEC 2
59:
60: char *filearg[MAXFILEC];
1.35 otto 61: bool ok_to_create_file = false;
1.29 otto 62: char *outname = NULL;
63: char *origprae = NULL;
64: char *TMPOUTNAME;
65: char *TMPINNAME;
66: char *TMPREJNAME;
67: char *TMPPATNAME;
1.35 otto 68: bool toutkeep = false;
69: bool trejkeep = false;
1.33 otto 70: bool warn_on_invalid_line;
1.37 ! otto 71: bool last_line_missing_eol;
1.29 otto 72:
73: #ifdef DEBUGGING
1.30 deraadt 74: int debug = 0;
1.29 otto 75: #endif
76:
1.35 otto 77: bool force = false;
78: bool batch = false;
79: bool verbose = true;
80: bool reverse = false;
81: bool noreverse = false;
82: bool skip_rest_of_patch = false;
1.29 otto 83: int strippath = 957;
1.35 otto 84: bool canonicalize = false;
85: bool check_only = false;
1.29 otto 86: int diff_type = 0;
87: char *revision = NULL; /* prerequisite revision, if any */
88: LINENUM input_lines = 0; /* how long is input file in lines */
1.23 otto 89:
90: static void reinitialize_almost_everything(void);
91: static void get_some_switches(void);
92: static LINENUM locate_hunk(LINENUM);
93: static void abort_hunk(void);
94: static void apply_hunk(LINENUM);
1.29 otto 95: static void init_output(const char *);
96: static void init_reject(const char *);
1.37 ! otto 97: static void copy_till(LINENUM, bool);
1.23 otto 98: static void spew_output(void);
1.37 ! otto 99: static void dump_line(LINENUM, bool);
1.23 otto 100: static bool patch_match(LINENUM, LINENUM, LINENUM);
1.29 otto 101: static bool similar(const char *, const char *, int);
1.24 millert 102: static __dead void usage(void);
1.1 deraadt 103:
1.35 otto 104: /* true if -E was specified on command line. */
105: static bool remove_empty_files = false;
1.1 deraadt 106:
1.35 otto 107: /* true if -R was specified on command line. */
108: static bool reverse_flag_specified = false;
1.1 deraadt 109:
1.25 millert 110: /* buffer holding the name of the rejected patch file. */
111: static char rejname[NAME_MAX + 1];
112:
113: /* buffer for stderr */
1.23 otto 114: static char serrbuf[BUFSIZ];
1.25 millert 115:
1.29 otto 116: /* how many input lines have been irretractibly output */
117: static LINENUM last_frozen_line = 0;
118:
119: static int Argc; /* guess */
120: static char **Argv;
121: static int Argc_last; /* for restarting plan_b */
122: static char **Argv_last;
123:
124: static FILE *ofp = NULL; /* output file pointer */
125: static FILE *rejfp = NULL; /* reject file pointer */
126:
127: static int filec = 0; /* how many file arguments? */
128: static LINENUM last_offset = 0;
129: static LINENUM maxfuzz = 2;
130:
131: /* patch using ifdef, ifndef, etc. */
1.35 otto 132: static bool do_defines = false;
1.29 otto 133: /* #ifdef xyzzy */
134: static char if_defined[128];
135: /* #ifndef xyzzy */
136: static char not_defined[128];
137: /* #else */
138: static const char else_defined[] = "#else\n";
139: /* #endif xyzzy */
140: static char end_defined[128];
141:
1.11 espie 142:
1.1 deraadt 143: /* Apply a set of diffs as appropriate. */
144:
145: int
1.19 deraadt 146: main(int argc, char *argv[])
1.1 deraadt 147: {
1.31 millert 148: int error = 0, hunk, failed, patch_seen = 0, i, fd;
1.35 otto 149: LINENUM where = 0, newwhere, fuzz, mymaxfuzz;
1.31 millert 150: const char *tmpdir;
151: char *v;
1.20 deraadt 152:
153: setbuf(stderr, serrbuf);
154: for (i = 0; i < MAXFILEC; i++)
1.23 otto 155: filearg[i] = NULL;
1.20 deraadt 156:
157: /* Cons up the names of the temporary files. */
1.31 millert 158: if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0')
159: tmpdir = _PATH_TMP;
160: for (i = strlen(tmpdir) - 1; i > 0 && tmpdir[i] == '/'; i--)
161: ;
162: i++;
163: if (asprintf(&TMPOUTNAME, "%.*s/patchoXXXXXXXXXX", i, tmpdir) == -1)
1.20 deraadt 164: fatal("cannot allocate memory");
1.31 millert 165: if ((fd = mkstemp(TMPOUTNAME)) < 0)
1.20 deraadt 166: pfatal("can't create %s", TMPOUTNAME);
1.31 millert 167: close(fd);
1.20 deraadt 168:
1.31 millert 169: if (asprintf(&TMPINNAME, "%.*s/patchiXXXXXXXXXX", i, tmpdir) == -1)
1.20 deraadt 170: fatal("cannot allocate memory");
1.31 millert 171: if ((fd = mkstemp(TMPINNAME)) < 0)
1.20 deraadt 172: pfatal("can't create %s", TMPINNAME);
1.31 millert 173: close(fd);
1.20 deraadt 174:
1.31 millert 175: if (asprintf(&TMPREJNAME, "%.*s/patchrXXXXXXXXXX", i, tmpdir) == -1)
1.20 deraadt 176: fatal("cannot allocate memory");
1.31 millert 177: if ((fd = mkstemp(TMPREJNAME)) < 0)
1.20 deraadt 178: pfatal("can't create %s", TMPREJNAME);
1.31 millert 179: close(fd);
1.20 deraadt 180:
1.31 millert 181: if (asprintf(&TMPPATNAME, "%.*s/patchpXXXXXXXXXX", i, tmpdir) == -1)
1.20 deraadt 182: fatal("cannot allocate memory");
1.31 millert 183: if ((fd = mkstemp(TMPPATNAME)) < 0)
1.20 deraadt 184: pfatal("can't create %s", TMPPATNAME);
1.31 millert 185: close(fd);
1.20 deraadt 186:
187: v = getenv("SIMPLE_BACKUP_SUFFIX");
188: if (v)
189: simple_backup_suffix = v;
190: else
191: simple_backup_suffix = ORIGEXT;
192:
193: /* parse switches */
194: Argc = argc;
195: Argv = argv;
196: get_some_switches();
197:
1.27 millert 198: if (backup_type == none) {
199: v = getenv("VERSION_CONTROL");
200: #ifdef notyet
201: if (v != NULL)
202: #endif
203: backup_type = get_version(v); /* OK to pass NULL. */
204: }
205:
1.20 deraadt 206: /* make sure we clean up /tmp in case of disaster */
207: set_signals(0);
208:
209: for (open_patch_file(filearg[1]); there_is_another_patch();
210: reinitialize_almost_everything()) {
211: /* for each patch in patch file */
212:
1.35 otto 213: patch_seen = true;
214: warn_on_invalid_line = true;
1.20 deraadt 215:
1.23 otto 216: if (outname == NULL)
1.20 deraadt 217: outname = savestr(filearg[0]);
1.1 deraadt 218:
1.20 deraadt 219: /* for ed script just up and do it and exit */
220: if (diff_type == ED_DIFF) {
221: do_ed_script();
222: continue;
223: }
224: /* initialize the patched file */
225: if (!skip_rest_of_patch)
226: init_output(TMPOUTNAME);
227:
228: /* initialize reject file */
229: init_reject(TMPREJNAME);
230:
231: /* find out where all the lines are */
232: if (!skip_rest_of_patch)
233: scan_input(filearg[0]);
234:
235: /* from here on, open no standard i/o files, because malloc */
236: /* might misfire and we can't catch it easily */
237:
238: /* apply each hunk of patch */
239: hunk = 0;
240: failed = 0;
1.35 otto 241: out_of_mem = false;
1.20 deraadt 242: while (another_hunk()) {
243: hunk++;
1.29 otto 244: fuzz = 0;
1.20 deraadt 245: mymaxfuzz = pch_context();
246: if (maxfuzz < mymaxfuzz)
247: mymaxfuzz = maxfuzz;
248: if (!skip_rest_of_patch) {
249: do {
250: where = locate_hunk(fuzz);
1.29 otto 251: if (hunk == 1 && where == 0 && !force) {
1.1 deraadt 252: /* dwim for reversed patch? */
1.20 deraadt 253: if (!pch_swap()) {
1.29 otto 254: if (fuzz == 0)
1.20 deraadt 255: say("Not enough memory to try swapped hunk! Assuming unswapped.\n");
256: continue;
257: }
258: reverse = !reverse;
259: /* try again */
260: where = locate_hunk(fuzz);
1.29 otto 261: if (where == 0) {
1.20 deraadt 262: /* didn't find it swapped */
263: if (!pch_swap())
264: /* put it back to normal */
265: fatal("lost hunk on alloc error!\n");
266: reverse = !reverse;
267: } else if (noreverse) {
268: if (!pch_swap())
269: /* put it back to normal */
270: fatal("lost hunk on alloc error!\n");
271: reverse = !reverse;
272: say("Ignoring previously applied (or reversed) patch.\n");
1.35 otto 273: skip_rest_of_patch = true;
1.20 deraadt 274: } else if (batch) {
275: if (verbose)
276: say("%seversed (or previously applied) patch detected! %s -R.",
277: reverse ? "R" : "Unr",
278: reverse ? "Assuming" : "Ignoring");
279: } else {
280: ask("%seversed (or previously applied) patch detected! %s -R? [y] ",
281: reverse ? "R" : "Unr",
282: reverse ? "Assume" : "Ignore");
283: if (*buf == 'n') {
284: ask("Apply anyway? [n] ");
285: if (*buf != 'y')
1.35 otto 286: skip_rest_of_patch = true;
1.29 otto 287: where = 0;
1.20 deraadt 288: reverse = !reverse;
289: if (!pch_swap())
290: /* put it back to normal */
291: fatal("lost hunk on alloc error!\n");
292: }
293: }
294: }
1.29 otto 295: } while (!skip_rest_of_patch && where == 0 &&
1.30 deraadt 296: ++fuzz <= mymaxfuzz);
1.20 deraadt 297:
298: if (skip_rest_of_patch) { /* just got decided */
299: fclose(ofp);
1.23 otto 300: ofp = NULL;
1.20 deraadt 301: }
302: }
303: newwhere = pch_newfirst() + last_offset;
304: if (skip_rest_of_patch) {
305: abort_hunk();
306: failed++;
307: if (verbose)
308: say("Hunk #%d ignored at %ld.\n",
309: hunk, newwhere);
1.29 otto 310: } else if (where == 0) {
1.20 deraadt 311: abort_hunk();
312: failed++;
313: if (verbose)
314: say("Hunk #%d failed at %ld.\n",
315: hunk, newwhere);
316: } else {
317: apply_hunk(where);
318: if (verbose) {
319: say("Hunk #%d succeeded at %ld",
320: hunk, newwhere);
1.29 otto 321: if (fuzz != 0)
1.20 deraadt 322: say(" with fuzz %ld", fuzz);
323: if (last_offset)
324: say(" (offset %ld line%s)",
325: last_offset,
326: last_offset == 1L ? "" : "s");
327: say(".\n");
328: }
329: }
330: }
331:
332: if (out_of_mem && using_plan_a) {
333: Argc = Argc_last;
334: Argv = Argv_last;
335: say("\n\nRan out of memory using Plan A--trying again...\n\n");
336: if (ofp)
337: fclose(ofp);
1.23 otto 338: ofp = NULL;
1.20 deraadt 339: if (rejfp)
340: fclose(rejfp);
1.23 otto 341: rejfp = NULL;
1.20 deraadt 342: continue;
1.11 espie 343: }
1.35 otto 344: if (hunk == 0)
345: fatal("Internal error: hunk should not be 0\n");
1.1 deraadt 346:
1.20 deraadt 347: /* finish spewing out the new file */
348: if (!skip_rest_of_patch)
349: spew_output();
350:
351: /* and put the output where desired */
352: ignore_signals();
353: if (!skip_rest_of_patch) {
354: struct stat statbuf;
355: char *realout = outname;
356:
357: if (!check_only) {
358: if (move_file(TMPOUTNAME, outname) < 0) {
1.35 otto 359: toutkeep = true;
1.20 deraadt 360: realout = TMPOUTNAME;
361: chmod(TMPOUTNAME, filemode);
362: } else
363: chmod(outname, filemode);
364:
365: if (remove_empty_files &&
366: stat(realout, &statbuf) == 0 &&
367: statbuf.st_size == 0) {
368: if (verbose)
369: say("Removing %s (empty after patching).\n",
370: realout);
371: unlink(realout);
372: }
373: }
374: }
375: fclose(rejfp);
1.23 otto 376: rejfp = NULL;
1.20 deraadt 377: if (failed) {
1.28 millert 378: error = 1;
1.29 otto 379: if (*rejname == '\0') {
1.20 deraadt 380: if (strlcpy(rejname, outname,
381: sizeof(rejname)) >= sizeof(rejname))
382: fatal("filename %s is too long\n", outname);
383: if (strlcat(rejname, REJEXT,
384: sizeof(rejname)) >= sizeof(rejname))
385: fatal("filename %s is too long\n", outname);
386: }
387: if (skip_rest_of_patch) {
388: say("%d out of %d hunks ignored--saving rejects to %s\n",
389: failed, hunk, rejname);
390: } else {
391: say("%d out of %d hunks failed--saving rejects to %s\n",
392: failed, hunk, rejname);
393: }
394: if (!check_only && move_file(TMPREJNAME, rejname) < 0)
1.35 otto 395: trejkeep = true;
1.20 deraadt 396: }
397: set_signals(1);
398: }
1.28 millert 399: my_exit(error);
1.20 deraadt 400: /* NOTREACHED */
1.1 deraadt 401: }
402:
403: /* Prepare to find the next patch to do in the patch file. */
404:
1.23 otto 405: static void
1.20 deraadt 406: reinitialize_almost_everything(void)
1.1 deraadt 407: {
1.20 deraadt 408: re_patch();
409: re_input();
1.1 deraadt 410:
1.20 deraadt 411: input_lines = 0;
412: last_frozen_line = 0;
1.1 deraadt 413:
1.20 deraadt 414: filec = 0;
1.35 otto 415: if (!out_of_mem) {
1.20 deraadt 416: free(filearg[0]);
1.23 otto 417: filearg[0] = NULL;
1.20 deraadt 418: }
1.35 otto 419:
420: free(outname);
421: outname = NULL;
422:
1.20 deraadt 423: last_offset = 0;
1.35 otto 424: diff_type = 0;
1.1 deraadt 425:
1.35 otto 426: free(revision);
427: revision = NULL;
1.1 deraadt 428:
1.20 deraadt 429: reverse = reverse_flag_specified;
1.35 otto 430: skip_rest_of_patch = false;
1.1 deraadt 431:
1.20 deraadt 432: get_some_switches();
1.1 deraadt 433: }
434:
1.24 millert 435: /* Process switches and filenames. */
1.1 deraadt 436:
1.23 otto 437: static void
1.20 deraadt 438: get_some_switches(void)
1.1 deraadt 439: {
1.34 millert 440: const char *options = "b::B:cCd:D:eEfF:i:lnNo:p:r:RstuvV:x:z:";
1.24 millert 441: static struct option longopts[] = {
1.27 millert 442: {"backup", no_argument, 0, 'b'},
1.24 millert 443: {"batch", no_argument, 0, 't'},
444: {"check", no_argument, 0, 'C'},
445: {"context", no_argument, 0, 'c'},
446: {"debug", required_argument, 0, 'x'},
447: {"directory", required_argument, 0, 'd'},
448: {"ed", no_argument, 0, 'e'},
449: {"force", no_argument, 0, 'f'},
450: {"forward", no_argument, 0, 'N'},
451: {"fuzz", required_argument, 0, 'F'},
452: {"ifdef", required_argument, 0, 'D'},
1.32 millert 453: {"input", required_argument, 0, 'i'},
1.24 millert 454: {"ignore-whitespace", no_argument, 0, 'l'},
455: {"normal", no_argument, 0, 'n'},
456: {"output", required_argument, 0, 'o'},
457: {"prefix", required_argument, 0, 'B'},
458: {"quiet", no_argument, 0, 's'},
459: {"reject-file", required_argument, 0, 'r'},
460: {"remove-empty-files", no_argument, 0, 'E'},
461: {"reverse", no_argument, 0, 'R'},
462: {"silent", no_argument, 0, 's'},
1.34 millert 463: {"strip", required_argument, 0, 'p'},
1.27 millert 464: {"suffix", required_argument, 0, 'z'},
1.24 millert 465: {"unified", no_argument, 0, 'u'},
466: {"version", no_argument, 0, 'v'},
467: {"version-control", required_argument, 0, 'V'},
468: {NULL, 0, 0, 0}
469: };
470: int ch;
1.1 deraadt 471:
1.20 deraadt 472: rejname[0] = '\0';
473: Argc_last = Argc;
474: Argv_last = Argv;
475: if (!Argc)
476: return;
1.24 millert 477: optreset = optind = 1;
478: while ((ch = getopt_long(Argc, Argv, options, longopts, NULL)) != -1) {
479: switch (ch) {
480: case 'b':
1.27 millert 481: #ifdef notyet
482: if (backup_type == none)
483: backup_type = numbered_existing;
484: #endif
485: if (optarg == NULL)
486: break;
487: if (verbose)
488: say("Warning, the ``-b suffix'' option has been"
489: " obsoleted by the -z option.\n");
490: /* FALLTHROUGH */
491: case 'z':
492: /* must directly follow 'b' case for backwards compat */
1.24 millert 493: simple_backup_suffix = savestr(optarg);
494: break;
495: case 'B':
496: origprae = savestr(optarg);
497: break;
498: case 'c':
499: diff_type = CONTEXT_DIFF;
500: break;
501: case 'C':
1.35 otto 502: check_only = true;
1.24 millert 503: break;
504: case 'd':
505: if (chdir(optarg) < 0)
506: pfatal("can't cd to %s", optarg);
507: break;
508: case 'D':
1.35 otto 509: do_defines = true;
1.24 millert 510: if (!isalpha(*optarg) && *optarg != '_')
511: fatal("argument to -D is not an identifier\n");
512: snprintf(if_defined, sizeof if_defined,
513: "#ifdef %s\n", optarg);
514: snprintf(not_defined, sizeof not_defined,
515: "#ifndef %s\n", optarg);
516: snprintf(end_defined, sizeof end_defined,
517: "#endif /* %s */\n", optarg);
518: break;
519: case 'e':
520: diff_type = ED_DIFF;
521: break;
522: case 'E':
1.35 otto 523: remove_empty_files = true;
1.24 millert 524: break;
525: case 'f':
1.35 otto 526: force = true;
1.24 millert 527: break;
528: case 'F':
529: maxfuzz = atoi(optarg);
530: break;
1.32 millert 531: case 'i':
532: if (++filec == MAXFILEC)
533: fatal("too many file arguments\n");
534: filearg[filec] = savestr(optarg);
535: break;
1.24 millert 536: case 'l':
1.35 otto 537: canonicalize = true;
1.24 millert 538: break;
539: case 'n':
540: diff_type = NORMAL_DIFF;
541: break;
542: case 'N':
1.35 otto 543: noreverse = true;
1.24 millert 544: break;
545: case 'o':
546: outname = savestr(optarg);
547: break;
548: case 'p':
1.34 millert 549: strippath = atoi(optarg);
1.24 millert 550: break;
551: case 'r':
552: if (strlcpy(rejname, optarg,
553: sizeof(rejname)) >= sizeof(rejname))
554: fatal("argument for -r is too long\n");
555: break;
556: case 'R':
1.35 otto 557: reverse = true;
558: reverse_flag_specified = true;
1.24 millert 559: break;
560: case 's':
1.35 otto 561: verbose = false;
1.24 millert 562: break;
563: case 't':
1.35 otto 564: batch = true;
1.24 millert 565: break;
566: case 'u':
567: diff_type = UNI_DIFF;
568: break;
569: case 'v':
570: version();
571: break;
572: case 'V':
573: backup_type = get_version(optarg);
574: break;
1.1 deraadt 575: #ifdef DEBUGGING
1.24 millert 576: case 'x':
577: debug = atoi(optarg);
578: break;
1.1 deraadt 579: #endif
1.24 millert 580: default:
581: usage();
582: break;
1.20 deraadt 583: }
1.1 deraadt 584: }
1.24 millert 585: Argc -= optind;
586: Argv += optind;
587:
1.32 millert 588: if (Argc > 0) {
589: filearg[0] = savestr(*Argv++);
1.24 millert 590: Argc--;
1.32 millert 591: while (Argc > 0) {
592: if (++filec == MAXFILEC)
593: fatal("too many file arguments\n");
594: filearg[filec] = savestr(*Argv++);
595: Argc--;
596: }
1.24 millert 597: }
598: }
599:
600: static __dead void
601: usage(void)
602: {
603: fprintf(stderr,
1.27 millert 604: "usage: patch [-bcCeEflnNRstuv] [-B backup-prefix] [-d directory] [-D symbol]\n"
1.34 millert 605: " [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]\n"
1.32 millert 606: " [-r rej-name] [-V {numbered,existing,simple}] [-z backup-ext]\n"
1.24 millert 607: " [origfile [patchfile]]\n");
1.28 millert 608: my_exit(EXIT_SUCCESS);
1.1 deraadt 609: }
610:
1.20 deraadt 611: /*
612: * Attempt to find the right place to apply this hunk of patch.
613: */
1.23 otto 614: static LINENUM
1.20 deraadt 615: locate_hunk(LINENUM fuzz)
1.1 deraadt 616: {
1.20 deraadt 617: LINENUM first_guess = pch_first() + last_offset;
618: LINENUM offset;
619: LINENUM pat_lines = pch_ptrn_lines();
620: LINENUM max_pos_offset = input_lines - first_guess - pat_lines + 1;
621: LINENUM max_neg_offset = first_guess - last_frozen_line - 1 + pch_context();
622:
1.36 otto 623: if (pat_lines == 0) { /* null range matches always */
624: if (verbose && (diff_type == CONTEXT_DIFF
625: || diff_type == NEW_CONTEXT_DIFF
626: || diff_type == UNI_DIFF)) {
627: say("Empty context always matches.\n");
628: say("Detection of previously applied patch not possible.\n");
629: }
1.20 deraadt 630: return first_guess;
1.36 otto 631: }
1.20 deraadt 632: if (max_neg_offset >= first_guess) /* do not try lines < 0 */
633: max_neg_offset = first_guess - 1;
1.29 otto 634: if (first_guess <= input_lines && patch_match(first_guess, 0, fuzz))
1.20 deraadt 635: return first_guess;
636: for (offset = 1; ; offset++) {
637: bool check_after = (offset <= max_pos_offset);
638: bool check_before = (offset <= max_neg_offset);
1.1 deraadt 639:
1.20 deraadt 640: if (check_after && patch_match(first_guess, offset, fuzz)) {
1.1 deraadt 641: #ifdef DEBUGGING
1.20 deraadt 642: if (debug & 1)
643: say("Offset changing from %ld to %ld\n",
644: last_offset, offset);
1.1 deraadt 645: #endif
1.20 deraadt 646: last_offset = offset;
647: return first_guess + offset;
648: } else if (check_before && patch_match(first_guess, -offset, fuzz)) {
1.1 deraadt 649: #ifdef DEBUGGING
1.20 deraadt 650: if (debug & 1)
651: say("Offset changing from %ld to %ld\n",
652: last_offset, -offset);
1.1 deraadt 653: #endif
1.20 deraadt 654: last_offset = -offset;
655: return first_guess - offset;
656: } else if (!check_before && !check_after)
1.29 otto 657: return 0;
1.1 deraadt 658: }
659: }
660:
661: /* We did not find the pattern, dump out the hunk so they can handle it. */
662:
1.23 otto 663: static void
1.20 deraadt 664: abort_hunk(void)
1.1 deraadt 665: {
1.20 deraadt 666: LINENUM i;
1.29 otto 667: const LINENUM pat_end = pch_end();
1.20 deraadt 668: /*
669: * add in last_offset to guess the same as the previous successful
670: * hunk
671: */
1.29 otto 672: const LINENUM oldfirst = pch_first() + last_offset;
673: const LINENUM newfirst = pch_newfirst() + last_offset;
674: const LINENUM oldlast = oldfirst + pch_ptrn_lines() - 1;
675: const LINENUM newlast = newfirst + pch_repl_lines() - 1;
676: const char *stars = (diff_type >= NEW_CONTEXT_DIFF ? " ****" : "");
677: const char *minuses = (diff_type >= NEW_CONTEXT_DIFF ? " ----" : " -----");
1.20 deraadt 678:
679: fprintf(rejfp, "***************\n");
680: for (i = 0; i <= pat_end; i++) {
681: switch (pch_char(i)) {
682: case '*':
683: if (oldlast < oldfirst)
684: fprintf(rejfp, "*** 0%s\n", stars);
685: else if (oldlast == oldfirst)
686: fprintf(rejfp, "*** %ld%s\n", oldfirst, stars);
687: else
688: fprintf(rejfp, "*** %ld,%ld%s\n", oldfirst,
689: oldlast, stars);
690: break;
691: case '=':
692: if (newlast < newfirst)
693: fprintf(rejfp, "--- 0%s\n", minuses);
694: else if (newlast == newfirst)
695: fprintf(rejfp, "--- %ld%s\n", newfirst, minuses);
696: else
697: fprintf(rejfp, "--- %ld,%ld%s\n", newfirst,
698: newlast, minuses);
699: break;
700: case '\n':
701: fprintf(rejfp, "%s", pfetch(i));
702: break;
703: case ' ':
704: case '-':
705: case '+':
706: case '!':
707: fprintf(rejfp, "%c %s", pch_char(i), pfetch(i));
708: break;
709: default:
710: fatal("fatal internal error in abort_hunk\n");
711: }
1.1 deraadt 712: }
713: }
714:
715: /* We found where to apply it (we hope), so do it. */
716:
1.23 otto 717: static void
1.20 deraadt 718: apply_hunk(LINENUM where)
1.1 deraadt 719: {
1.29 otto 720: LINENUM old = 1;
721: const LINENUM lastline = pch_ptrn_lines();
722: LINENUM new = lastline + 1;
1.1 deraadt 723: #define OUTSIDE 0
724: #define IN_IFNDEF 1
725: #define IN_IFDEF 2
726: #define IN_ELSE 3
1.29 otto 727: int def_state = OUTSIDE;
728: const LINENUM pat_end = pch_end();
1.20 deraadt 729:
730: where--;
731: while (pch_char(new) == '=' || pch_char(new) == '\n')
732: new++;
733:
734: while (old <= lastline) {
735: if (pch_char(old) == '-') {
1.37 ! otto 736: copy_till(where + old - 1, false);
1.29 otto 737: if (do_defines) {
1.20 deraadt 738: if (def_state == OUTSIDE) {
739: fputs(not_defined, ofp);
740: def_state = IN_IFNDEF;
741: } else if (def_state == IN_IFDEF) {
742: fputs(else_defined, ofp);
743: def_state = IN_ELSE;
744: }
745: fputs(pfetch(old), ofp);
746: }
747: last_frozen_line++;
748: old++;
749: } else if (new > pat_end) {
750: break;
751: } else if (pch_char(new) == '+') {
1.37 ! otto 752: copy_till(where + old - 1, false);
1.29 otto 753: if (do_defines) {
1.20 deraadt 754: if (def_state == IN_IFNDEF) {
755: fputs(else_defined, ofp);
756: def_state = IN_ELSE;
757: } else if (def_state == OUTSIDE) {
758: fputs(if_defined, ofp);
759: def_state = IN_IFDEF;
760: }
761: }
762: fputs(pfetch(new), ofp);
763: new++;
764: } else if (pch_char(new) != pch_char(old)) {
765: say("Out-of-sync patch, lines %ld,%ld--mangled text or line numbers, maybe?\n",
766: pch_hunk_beg() + old,
767: pch_hunk_beg() + new);
1.1 deraadt 768: #ifdef DEBUGGING
1.20 deraadt 769: say("oldchar = '%c', newchar = '%c'\n",
770: pch_char(old), pch_char(new));
1.1 deraadt 771: #endif
1.28 millert 772: my_exit(2);
1.20 deraadt 773: } else if (pch_char(new) == '!') {
1.37 ! otto 774: copy_till(where + old - 1, false);
1.29 otto 775: if (do_defines) {
1.20 deraadt 776: fputs(not_defined, ofp);
777: def_state = IN_IFNDEF;
778: }
779: while (pch_char(old) == '!') {
1.29 otto 780: if (do_defines) {
1.20 deraadt 781: fputs(pfetch(old), ofp);
782: }
783: last_frozen_line++;
784: old++;
785: }
1.29 otto 786: if (do_defines) {
1.20 deraadt 787: fputs(else_defined, ofp);
788: def_state = IN_ELSE;
789: }
790: while (pch_char(new) == '!') {
791: fputs(pfetch(new), ofp);
792: new++;
793: }
794: } else {
1.35 otto 795: if (pch_char(new) != ' ')
796: fatal("Internal error: expected ' '\n");
1.20 deraadt 797: old++;
798: new++;
1.29 otto 799: if (do_defines && def_state != OUTSIDE) {
1.20 deraadt 800: fputs(end_defined, ofp);
801: def_state = OUTSIDE;
802: }
803: }
1.1 deraadt 804: }
1.20 deraadt 805: if (new <= pat_end && pch_char(new) == '+') {
1.37 ! otto 806: copy_till(where + old - 1, false);
1.29 otto 807: if (do_defines) {
1.20 deraadt 808: if (def_state == OUTSIDE) {
809: fputs(if_defined, ofp);
810: def_state = IN_IFDEF;
811: } else if (def_state == IN_IFNDEF) {
812: fputs(else_defined, ofp);
813: def_state = IN_ELSE;
814: }
815: }
816: while (new <= pat_end && pch_char(new) == '+') {
817: fputs(pfetch(new), ofp);
818: new++;
1.1 deraadt 819: }
820: }
1.29 otto 821: if (do_defines && def_state != OUTSIDE) {
1.1 deraadt 822: fputs(end_defined, ofp);
823: }
824: }
825:
1.20 deraadt 826: /*
827: * Open the new file.
828: */
1.23 otto 829: static void
1.29 otto 830: init_output(const char *name)
1.1 deraadt 831: {
1.20 deraadt 832: ofp = fopen(name, "w");
1.23 otto 833: if (ofp == NULL)
1.20 deraadt 834: pfatal("can't create %s", name);
1.1 deraadt 835: }
836:
1.20 deraadt 837: /*
838: * Open a file to put hunks we can't locate.
839: */
1.23 otto 840: static void
1.29 otto 841: init_reject(const char *name)
1.1 deraadt 842: {
1.20 deraadt 843: rejfp = fopen(name, "w");
1.23 otto 844: if (rejfp == NULL)
1.20 deraadt 845: pfatal("can't create %s", name);
1.1 deraadt 846: }
847:
1.20 deraadt 848: /*
849: * Copy input file to output, up to wherever hunk is to be applied.
1.37 ! otto 850: * If endoffile is true, treat the last line specially since it may
! 851: * lack a newline.
1.20 deraadt 852: */
1.23 otto 853: static void
1.37 ! otto 854: copy_till(LINENUM lastline, bool endoffile)
1.1 deraadt 855: {
1.29 otto 856: if (last_frozen_line > lastline)
1.20 deraadt 857: fatal("misordered hunks! output would be garbled\n");
1.37 ! otto 858: while (last_frozen_line < lastline) {
! 859: if (++last_frozen_line == lastline && endoffile)
! 860: dump_line(last_frozen_line, !last_line_missing_eol);
! 861: else
! 862: dump_line(last_frozen_line, true);
! 863: }
1.1 deraadt 864: }
865:
1.20 deraadt 866: /*
867: * Finish copying the input file to the output file.
868: */
1.23 otto 869: static void
1.20 deraadt 870: spew_output(void)
1.1 deraadt 871: {
872: #ifdef DEBUGGING
1.20 deraadt 873: if (debug & 256)
874: say("il=%ld lfl=%ld\n", input_lines, last_frozen_line);
1.1 deraadt 875: #endif
1.20 deraadt 876: if (input_lines)
1.37 ! otto 877: copy_till(input_lines, true); /* dump remainder of file */
1.20 deraadt 878: fclose(ofp);
1.23 otto 879: ofp = NULL;
1.1 deraadt 880: }
881:
1.20 deraadt 882: /*
883: * Copy one line from input to output.
884: */
1.23 otto 885: static void
1.37 ! otto 886: dump_line(LINENUM line, bool write_newline)
1.1 deraadt 887: {
1.29 otto 888: char *s;
1.1 deraadt 889:
1.26 otto 890: s = ifetch(line, 0);
891: if (s == NULL)
892: return;
1.30 deraadt 893: /* Note: string is not NUL terminated. */
1.37 ! otto 894: for (; *s != '\n'; s++)
! 895: putc(*s, ofp);
! 896: if (write_newline)
! 897: putc('\n', ofp);
1.1 deraadt 898: }
899:
1.20 deraadt 900: /*
901: * Does the patch pattern match at line base+offset?
902: */
1.23 otto 903: static bool
1.20 deraadt 904: patch_match(LINENUM base, LINENUM offset, LINENUM fuzz)
905: {
1.29 otto 906: LINENUM pline = 1 + fuzz;
907: LINENUM iline;
908: LINENUM pat_lines = pch_ptrn_lines() - fuzz;
909: const char *ilineptr;
1.30 deraadt 910: const char *plineptr;
911: short plinelen;
1.20 deraadt 912:
913: for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) {
1.26 otto 914: ilineptr = ifetch(iline, offset >= 0);
915: if (ilineptr == NULL)
1.35 otto 916: return false;
1.26 otto 917: plineptr = pfetch(pline);
918: plinelen = pch_line_len(pline);
1.20 deraadt 919: if (canonicalize) {
1.26 otto 920: if (!similar(ilineptr, plineptr, plinelen))
1.35 otto 921: return false;
1.26 otto 922: } else if (strnNE(ilineptr, plineptr, plinelen))
1.35 otto 923: return false;
1.1 deraadt 924: }
1.35 otto 925: return true;
1.1 deraadt 926: }
927:
1.20 deraadt 928: /*
929: * Do two lines match with canonicalized white space?
930: */
1.23 otto 931: static bool
1.29 otto 932: similar(const char *a, const char *b, int len)
1.20 deraadt 933: {
934: while (len) {
935: if (isspace(*b)) { /* whitespace (or \n) to match? */
936: if (!isspace(*a)) /* no corresponding whitespace? */
1.35 otto 937: return false;
1.20 deraadt 938: while (len && isspace(*b) && *b != '\n')
939: b++, len--; /* skip pattern whitespace */
940: while (isspace(*a) && *a != '\n')
941: a++; /* skip target whitespace */
942: if (*a == '\n' || *b == '\n')
943: return (*a == *b); /* should end in sync */
944: } else if (*a++ != *b++) /* match non-whitespace chars */
1.35 otto 945: return false;
1.20 deraadt 946: else
947: len--; /* probably not necessary */
1.1 deraadt 948: }
1.35 otto 949: return true; /* actually, this is not reached */
1.20 deraadt 950: /* since there is always a \n */
1.1 deraadt 951: }
![[BACK]](/icons/back.gif){kind=icon}
Return to patch.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / patch