Index: stable/11/usr.bin/patch/common.h =================================================================== --- stable/11/usr.bin/patch/common.h (revision 345877) +++ stable/11/usr.bin/patch/common.h (revision 345878) @@ -1,111 +1,112 @@ /*- * Copyright 1986, Larry Wall * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * patch - a program to apply diffs to original files * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * * $OpenBSD: common.h,v 1.26 2006/03/11 19:41:30 otto Exp $ * $FreeBSD$ */ #include #include #include #define DEBUGGING /* constants */ #define MAXHUNKSIZE 200000 /* is this enough lines? */ #define INITHUNKMAX 125 /* initial dynamic allocation size */ #define INITLINELEN 4096 #define BUFFERSIZE 4096 #define LINENUM_MAX LONG_MAX #define ORIGEXT ".orig" #define REJEXT ".rej" /* handy definitions */ #define strEQ(s1,s2) (strcmp(s1, s2) == 0) #define strnNE(s1,s2,l) (strncmp(s1, s2, l) != 0) #define strnEQ(s1,s2,l) (strncmp(s1, s2, l) == 0) /* typedefs */ typedef long LINENUM; /* must be signed */ /* globals */ extern mode_t filemode; extern char *buf; /* general purpose buffer */ extern size_t buf_size; /* size of general purpose buffer */ extern bool using_plan_a; /* try to keep everything in memory */ extern bool out_of_mem; /* ran out of memory in plan a */ +extern bool nonempty_patchf_seen; /* seen a non-zero-length patch file? */ #define MAXFILEC 2 extern char *filearg[MAXFILEC]; extern bool ok_to_create_file; extern char *outname; extern char *origprae; extern char *TMPOUTNAME; extern char *TMPINNAME; extern char *TMPREJNAME; extern char *TMPPATNAME; extern bool toutkeep; extern bool trejkeep; #ifdef DEBUGGING extern int debug; #endif extern bool force; extern bool batch; extern bool verbose; extern bool reverse; extern bool noreverse; extern bool skip_rest_of_patch; extern int strippath; extern bool canonicalize; /* TRUE if -C was specified on command line. */ extern bool check_only; extern bool warn_on_invalid_line; extern bool last_line_missing_eol; #define CONTEXT_DIFF 1 #define NORMAL_DIFF 2 #define ED_DIFF 3 #define NEW_CONTEXT_DIFF 4 #define UNI_DIFF 5 extern int diff_type; extern char *revision; /* prerequisite revision, if any */ extern LINENUM input_lines; /* how long is input file in lines */ extern int posix; Index: stable/11/usr.bin/patch/patch.c =================================================================== --- stable/11/usr.bin/patch/patch.c (revision 345877) +++ stable/11/usr.bin/patch/patch.c (revision 345878) @@ -1,1085 +1,1086 @@ /*- * Copyright 1986, Larry Wall * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * patch - a program to apply diffs to original files * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * * $OpenBSD: patch.c,v 1.54 2014/12/13 10:31:07 tobias Exp $ * $FreeBSD$ * */ #include #include #include #include #include #include #include #include #include #include "common.h" #include "util.h" #include "pch.h" #include "inp.h" #include "backupfile.h" #include "pathnames.h" mode_t filemode = 0644; char *buf; /* general purpose buffer */ size_t buf_size; /* size of the general purpose buffer */ bool using_plan_a = true; /* try to keep everything in memory */ bool out_of_mem = false; /* ran out of memory in plan a */ +bool nonempty_patchf_seen = false; /* seen nonempty patch file? */ #define MAXFILEC 2 char *filearg[MAXFILEC]; bool ok_to_create_file = false; char *outname = NULL; char *origprae = NULL; char *TMPOUTNAME; char *TMPINNAME; char *TMPREJNAME; char *TMPPATNAME; bool toutkeep = false; bool trejkeep = false; bool warn_on_invalid_line; bool last_line_missing_eol; #ifdef DEBUGGING int debug = 0; #endif bool force = false; bool batch = false; bool verbose = true; bool reverse = false; bool noreverse = false; bool skip_rest_of_patch = false; int strippath = 957; bool canonicalize = false; bool check_only = false; int diff_type = 0; char *revision = NULL; /* prerequisite revision, if any */ LINENUM input_lines = 0; /* how long is input file in lines */ int posix = 0; /* strict POSIX mode? */ static void reinitialize_almost_everything(void); static void get_some_switches(void); static LINENUM locate_hunk(LINENUM); static void abort_context_hunk(void); static void rej_line(int, LINENUM); static void abort_hunk(void); static void apply_hunk(LINENUM); static void init_output(const char *); static void init_reject(const char *); static void copy_till(LINENUM, bool); static bool spew_output(void); static void dump_line(LINENUM, bool); static bool patch_match(LINENUM, LINENUM, LINENUM); static bool similar(const char *, const char *, int); static void usage(void); /* true if -E was specified on command line. */ static bool remove_empty_files = false; /* true if -R was specified on command line. */ static bool reverse_flag_specified = false; static bool Vflag = false; /* buffer holding the name of the rejected patch file. */ static char rejname[PATH_MAX]; /* how many input lines have been irretractibly output */ static LINENUM last_frozen_line = 0; static int Argc; /* guess */ static char **Argv; static int Argc_last; /* for restarting plan_b */ static char **Argv_last; static FILE *ofp = NULL; /* output file pointer */ static FILE *rejfp = NULL; /* reject file pointer */ static int filec = 0; /* how many file arguments? */ static LINENUM last_offset = 0; static LINENUM maxfuzz = 2; /* patch using ifdef, ifndef, etc. */ static bool do_defines = false; /* #ifdef xyzzy */ static char if_defined[128]; /* #ifndef xyzzy */ static char not_defined[128]; /* #else */ static const char else_defined[] = "#else\n"; /* #endif xyzzy */ static char end_defined[128]; /* Apply a set of diffs as appropriate. */ int main(int argc, char *argv[]) { int error = 0, hunk, failed, i, fd; bool patch_seen, reverse_seen; LINENUM where = 0, newwhere, fuzz, mymaxfuzz; const char *tmpdir; char *v; setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stderr, NULL, _IOLBF, 0); for (i = 0; i < MAXFILEC; i++) filearg[i] = NULL; buf_size = INITLINELEN; buf = malloc((unsigned)(buf_size)); if (buf == NULL) fatal("out of memory\n"); /* Cons up the names of the temporary files. */ if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0') tmpdir = _PATH_TMP; for (i = strlen(tmpdir) - 1; i > 0 && tmpdir[i] == '/'; i--) ; i++; if (asprintf(&TMPOUTNAME, "%.*s/patchoXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPOUTNAME)) < 0) pfatal("can't create %s", TMPOUTNAME); close(fd); if (asprintf(&TMPINNAME, "%.*s/patchiXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPINNAME)) < 0) pfatal("can't create %s", TMPINNAME); close(fd); if (asprintf(&TMPREJNAME, "%.*s/patchrXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPREJNAME)) < 0) pfatal("can't create %s", TMPREJNAME); close(fd); if (asprintf(&TMPPATNAME, "%.*s/patchpXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPPATNAME)) < 0) pfatal("can't create %s", TMPPATNAME); close(fd); v = getenv("SIMPLE_BACKUP_SUFFIX"); if (v) simple_backup_suffix = v; else simple_backup_suffix = ORIGEXT; /* parse switches */ Argc = argc; Argv = argv; get_some_switches(); if (!Vflag) { if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL) v = getenv("VERSION_CONTROL"); if (v != NULL || !posix) backup_type = get_version(v); /* OK to pass NULL. */ } /* make sure we clean up /tmp in case of disaster */ set_signals(0); patch_seen = false; for (open_patch_file(filearg[1]); there_is_another_patch(); reinitialize_almost_everything()) { /* for each patch in patch file */ patch_seen = true; warn_on_invalid_line = true; if (outname == NULL) outname = xstrdup(filearg[0]); /* for ed script just up and do it and exit */ if (diff_type == ED_DIFF) { do_ed_script(); continue; } /* initialize the patched file */ if (!skip_rest_of_patch) init_output(TMPOUTNAME); /* initialize reject file */ init_reject(TMPREJNAME); /* find out where all the lines are */ if (!skip_rest_of_patch) scan_input(filearg[0]); /* * from here on, open no standard i/o files, because * malloc might misfire and we can't catch it easily */ /* apply each hunk of patch */ hunk = 0; failed = 0; reverse_seen = false; out_of_mem = false; while (another_hunk()) { hunk++; fuzz = 0; mymaxfuzz = pch_context(); if (maxfuzz < mymaxfuzz) mymaxfuzz = maxfuzz; if (!skip_rest_of_patch) { do { where = locate_hunk(fuzz); if (hunk == 1 && where == 0 && !force && !reverse_seen) { /* dwim for reversed patch? */ if (!pch_swap()) { if (fuzz == 0) say("Not enough memory to try swapped hunk! Assuming unswapped.\n"); continue; } reverse = !reverse; /* try again */ where = locate_hunk(fuzz); if (where == 0) { /* didn't find it swapped */ if (!pch_swap()) /* put it back to normal */ fatal("lost hunk on alloc error!\n"); reverse = !reverse; } else if (noreverse) { if (!pch_swap()) /* put it back to normal */ fatal("lost hunk on alloc error!\n"); reverse = !reverse; say("Ignoring previously applied (or reversed) patch.\n"); skip_rest_of_patch = true; } else if (batch) { if (verbose) say("%seversed (or previously applied) patch detected! %s -R.", reverse ? "R" : "Unr", reverse ? "Assuming" : "Ignoring"); } else { ask("%seversed (or previously applied) patch detected! %s -R? [y] ", reverse ? "R" : "Unr", reverse ? "Assume" : "Ignore"); if (*buf == 'n') { ask("Apply anyway? [n] "); if (*buf != 'y') skip_rest_of_patch = true; else reverse_seen = true; where = 0; reverse = !reverse; if (!pch_swap()) /* put it back to normal */ fatal("lost hunk on alloc error!\n"); } } } } while (!skip_rest_of_patch && where == 0 && ++fuzz <= mymaxfuzz); if (skip_rest_of_patch) { /* just got decided */ if (ferror(ofp) || fclose(ofp)) { say("Error writing %s\n", TMPOUTNAME); error = 1; } ofp = NULL; } } newwhere = pch_newfirst() + last_offset; if (skip_rest_of_patch) { abort_hunk(); failed++; if (verbose) say("Hunk #%d ignored at %ld.\n", hunk, newwhere); } else if (where == 0) { abort_hunk(); failed++; if (verbose) say("Hunk #%d failed at %ld.\n", hunk, newwhere); } else { apply_hunk(where); if (verbose) { say("Hunk #%d succeeded at %ld", hunk, newwhere); if (fuzz != 0) say(" with fuzz %ld", fuzz); if (last_offset) say(" (offset %ld line%s)", last_offset, last_offset == 1L ? "" : "s"); say(".\n"); } } } if (out_of_mem && using_plan_a) { Argc = Argc_last; Argv = Argv_last; say("\n\nRan out of memory using Plan A--trying again...\n\n"); if (ofp) fclose(ofp); ofp = NULL; if (rejfp) fclose(rejfp); rejfp = NULL; continue; } if (hunk == 0) fatal("Internal error: hunk should not be 0\n"); /* finish spewing out the new file */ if (!skip_rest_of_patch && !spew_output()) { say("Can't write %s\n", TMPOUTNAME); error = 1; } /* and put the output where desired */ ignore_signals(); if (!skip_rest_of_patch) { struct stat statbuf; char *realout = outname; if (!check_only) { if (move_file(TMPOUTNAME, outname) < 0) { toutkeep = true; realout = TMPOUTNAME; chmod(TMPOUTNAME, filemode); } else chmod(outname, filemode); if (remove_empty_files && stat(realout, &statbuf) == 0 && statbuf.st_size == 0) { if (verbose) say("Removing %s (empty after patching).\n", realout); unlink(realout); } } } if (ferror(rejfp) || fclose(rejfp)) { say("Error writing %s\n", rejname); error = 1; } rejfp = NULL; if (failed) { error = 1; if (*rejname == '\0') { if (strlcpy(rejname, outname, sizeof(rejname)) >= sizeof(rejname)) fatal("filename %s is too long\n", outname); if (strlcat(rejname, REJEXT, sizeof(rejname)) >= sizeof(rejname)) fatal("filename %s is too long\n", outname); } if (!check_only) say("%d out of %d hunks %s--saving rejects to %s\n", failed, hunk, skip_rest_of_patch ? "ignored" : "failed", rejname); else say("%d out of %d hunks %s while patching %s\n", failed, hunk, skip_rest_of_patch ? "ignored" : "failed", filearg[0]); if (!check_only && move_file(TMPREJNAME, rejname) < 0) trejkeep = true; } set_signals(1); } - if (!patch_seen) + if (!patch_seen && nonempty_patchf_seen) error = 2; my_exit(error); /* NOTREACHED */ } /* Prepare to find the next patch to do in the patch file. */ static void reinitialize_almost_everything(void) { re_patch(); re_input(); input_lines = 0; last_frozen_line = 0; filec = 0; if (!out_of_mem) { free(filearg[0]); filearg[0] = NULL; } free(outname); outname = NULL; last_offset = 0; diff_type = 0; free(revision); revision = NULL; reverse = reverse_flag_specified; skip_rest_of_patch = false; get_some_switches(); } /* Process switches and filenames. */ static void get_some_switches(void) { const char *options = "b::B:cCd:D:eEfF:i:lnNo:p:r:RstuvV:x:z:"; static struct option longopts[] = { {"backup", no_argument, 0, 'b'}, {"batch", no_argument, 0, 't'}, {"check", no_argument, 0, 'C'}, {"context", no_argument, 0, 'c'}, {"debug", required_argument, 0, 'x'}, {"directory", required_argument, 0, 'd'}, {"dry-run", no_argument, 0, 'C'}, {"ed", no_argument, 0, 'e'}, {"force", no_argument, 0, 'f'}, {"forward", no_argument, 0, 'N'}, {"fuzz", required_argument, 0, 'F'}, {"ifdef", required_argument, 0, 'D'}, {"input", required_argument, 0, 'i'}, {"ignore-whitespace", no_argument, 0, 'l'}, {"normal", no_argument, 0, 'n'}, {"output", required_argument, 0, 'o'}, {"prefix", required_argument, 0, 'B'}, {"quiet", no_argument, 0, 's'}, {"reject-file", required_argument, 0, 'r'}, {"remove-empty-files", no_argument, 0, 'E'}, {"reverse", no_argument, 0, 'R'}, {"silent", no_argument, 0, 's'}, {"strip", required_argument, 0, 'p'}, {"suffix", required_argument, 0, 'z'}, {"unified", no_argument, 0, 'u'}, {"version", no_argument, 0, 'v'}, {"version-control", required_argument, 0, 'V'}, {"posix", no_argument, &posix, 1}, {NULL, 0, 0, 0} }; int ch; rejname[0] = '\0'; Argc_last = Argc; Argv_last = Argv; if (!Argc) return; optreset = optind = 1; while ((ch = getopt_long(Argc, Argv, options, longopts, NULL)) != -1) { switch (ch) { case 'b': if (backup_type == none) backup_type = numbered_existing; if (optarg == NULL) break; if (verbose) say("Warning, the ``-b suffix'' option has been" " obsoleted by the -z option.\n"); /* FALLTHROUGH */ case 'z': /* must directly follow 'b' case for backwards compat */ simple_backup_suffix = xstrdup(optarg); break; case 'B': origprae = xstrdup(optarg); break; case 'c': diff_type = CONTEXT_DIFF; break; case 'C': check_only = true; break; case 'd': if (chdir(optarg) < 0) pfatal("can't cd to %s", optarg); break; case 'D': do_defines = true; if (!isalpha((unsigned char)*optarg) && *optarg != '_') fatal("argument to -D is not an identifier\n"); snprintf(if_defined, sizeof if_defined, "#ifdef %s\n", optarg); snprintf(not_defined, sizeof not_defined, "#ifndef %s\n", optarg); snprintf(end_defined, sizeof end_defined, "#endif /* %s */\n", optarg); break; case 'e': diff_type = ED_DIFF; break; case 'E': remove_empty_files = true; break; case 'f': force = true; break; case 'F': maxfuzz = atoi(optarg); break; case 'i': if (++filec == MAXFILEC) fatal("too many file arguments\n"); filearg[filec] = xstrdup(optarg); break; case 'l': canonicalize = true; break; case 'n': diff_type = NORMAL_DIFF; break; case 'N': noreverse = true; break; case 'o': outname = xstrdup(optarg); break; case 'p': strippath = atoi(optarg); break; case 'r': if (strlcpy(rejname, optarg, sizeof(rejname)) >= sizeof(rejname)) fatal("argument for -r is too long\n"); break; case 'R': reverse = true; reverse_flag_specified = true; break; case 's': verbose = false; break; case 't': batch = true; break; case 'u': diff_type = UNI_DIFF; break; case 'v': version(); break; case 'V': backup_type = get_version(optarg); Vflag = true; break; #ifdef DEBUGGING case 'x': debug = atoi(optarg); break; #endif default: if (ch != '\0') usage(); break; } } Argc -= optind; Argv += optind; if (Argc > 0) { filearg[0] = xstrdup(*Argv++); Argc--; while (Argc > 0) { if (++filec == MAXFILEC) fatal("too many file arguments\n"); filearg[filec] = xstrdup(*Argv++); Argc--; } } if (getenv("POSIXLY_CORRECT") != NULL) posix = 1; } static void usage(void) { fprintf(stderr, "usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]\n" " [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]\n" " [-r rej-name] [-V t | nil | never | none] [-x number]\n" " [-z backup-ext] [--posix] [origfile [patchfile]]\n" " patch = first_guess) /* do not try lines < 0 */ max_neg_offset = first_guess - 1; if (first_guess <= input_lines && patch_match(first_guess, 0, fuzz)) return first_guess; for (offset = 1; ; offset++) { bool check_after = (offset <= max_pos_offset); bool check_before = (offset <= max_neg_offset); if (check_after && patch_match(first_guess, offset, fuzz)) { #ifdef DEBUGGING if (debug & 1) say("Offset changing from %ld to %ld\n", last_offset, offset); #endif last_offset = offset; return first_guess + offset; } else if (check_before && patch_match(first_guess, -offset, fuzz)) { #ifdef DEBUGGING if (debug & 1) say("Offset changing from %ld to %ld\n", last_offset, -offset); #endif last_offset = -offset; return first_guess - offset; } else if (!check_before && !check_after) return 0; } } /* We did not find the pattern, dump out the hunk so they can handle it. */ static void abort_context_hunk(void) { LINENUM i; const LINENUM pat_end = pch_end(); /* * add in last_offset to guess the same as the previous successful * hunk */ const LINENUM oldfirst = pch_first() + last_offset; const LINENUM newfirst = pch_newfirst() + last_offset; const LINENUM oldlast = oldfirst + pch_ptrn_lines() - 1; const LINENUM newlast = newfirst + pch_repl_lines() - 1; const char *stars = (diff_type >= NEW_CONTEXT_DIFF ? " ****" : ""); const char *minuses = (diff_type >= NEW_CONTEXT_DIFF ? " ----" : " -----"); fprintf(rejfp, "***************\n"); for (i = 0; i <= pat_end; i++) { switch (pch_char(i)) { case '*': if (oldlast < oldfirst) fprintf(rejfp, "*** 0%s\n", stars); else if (oldlast == oldfirst) fprintf(rejfp, "*** %ld%s\n", oldfirst, stars); else fprintf(rejfp, "*** %ld,%ld%s\n", oldfirst, oldlast, stars); break; case '=': if (newlast < newfirst) fprintf(rejfp, "--- 0%s\n", minuses); else if (newlast == newfirst) fprintf(rejfp, "--- %ld%s\n", newfirst, minuses); else fprintf(rejfp, "--- %ld,%ld%s\n", newfirst, newlast, minuses); break; case '\n': fprintf(rejfp, "%s", pfetch(i)); break; case ' ': case '-': case '+': case '!': fprintf(rejfp, "%c %s", pch_char(i), pfetch(i)); break; default: fatal("fatal internal error in abort_context_hunk\n"); } } } static void rej_line(int ch, LINENUM i) { size_t len; const char *line = pfetch(i); len = strlen(line); fprintf(rejfp, "%c%s", ch, line); if (len == 0 || line[len - 1] != '\n') { if (len >= USHRT_MAX) fprintf(rejfp, "\n\\ Line too long\n"); else fprintf(rejfp, "\n\\ No newline at end of line\n"); } } static void abort_hunk(void) { LINENUM i, j, split; int ch1, ch2; const LINENUM pat_end = pch_end(); const LINENUM oldfirst = pch_first() + last_offset; const LINENUM newfirst = pch_newfirst() + last_offset; if (diff_type != UNI_DIFF) { abort_context_hunk(); return; } split = -1; for (i = 0; i <= pat_end; i++) { if (pch_char(i) == '=') { split = i; break; } } if (split == -1) { fprintf(rejfp, "malformed hunk: no split found\n"); return; } i = 0; j = split + 1; fprintf(rejfp, "@@ -%ld,%ld +%ld,%ld @@\n", pch_ptrn_lines() ? oldfirst : 0, pch_ptrn_lines(), newfirst, pch_repl_lines()); while (i < split || j <= pat_end) { ch1 = i < split ? pch_char(i) : -1; ch2 = j <= pat_end ? pch_char(j) : -1; if (ch1 == '-') { rej_line('-', i); i++; } else if (ch1 == ' ' && ch2 == ' ') { rej_line(' ', i); i++; j++; } else if (ch1 == '!' && ch2 == '!') { while (i < split && ch1 == '!') { rej_line('-', i); i++; ch1 = i < split ? pch_char(i) : -1; } while (j <= pat_end && ch2 == '!') { rej_line('+', j); j++; ch2 = j <= pat_end ? pch_char(j) : -1; } } else if (ch1 == '*') { i++; } else if (ch2 == '+' || ch2 == ' ') { rej_line(ch2, j); j++; } else { fprintf(rejfp, "internal error on (%ld %ld %ld)\n", i, split, j); rej_line(ch1, i); rej_line(ch2, j); return; } } } /* We found where to apply it (we hope), so do it. */ static void apply_hunk(LINENUM where) { LINENUM old = 1; const LINENUM lastline = pch_ptrn_lines(); LINENUM new = lastline + 1; #define OUTSIDE 0 #define IN_IFNDEF 1 #define IN_IFDEF 2 #define IN_ELSE 3 int def_state = OUTSIDE; const LINENUM pat_end = pch_end(); where--; while (pch_char(new) == '=' || pch_char(new) == '\n') new++; while (old <= lastline) { if (pch_char(old) == '-') { copy_till(where + old - 1, false); if (do_defines) { if (def_state == OUTSIDE) { fputs(not_defined, ofp); def_state = IN_IFNDEF; } else if (def_state == IN_IFDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } fputs(pfetch(old), ofp); } last_frozen_line++; old++; } else if (new > pat_end) { break; } else if (pch_char(new) == '+') { copy_till(where + old - 1, false); if (do_defines) { if (def_state == IN_IFNDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } else if (def_state == OUTSIDE) { fputs(if_defined, ofp); def_state = IN_IFDEF; } } fputs(pfetch(new), ofp); new++; } else if (pch_char(new) != pch_char(old)) { say("Out-of-sync patch, lines %ld,%ld--mangled text or line numbers, maybe?\n", pch_hunk_beg() + old, pch_hunk_beg() + new); #ifdef DEBUGGING say("oldchar = '%c', newchar = '%c'\n", pch_char(old), pch_char(new)); #endif my_exit(2); } else if (pch_char(new) == '!') { copy_till(where + old - 1, false); if (do_defines) { fputs(not_defined, ofp); def_state = IN_IFNDEF; } while (pch_char(old) == '!') { if (do_defines) { fputs(pfetch(old), ofp); } last_frozen_line++; old++; } if (do_defines) { fputs(else_defined, ofp); def_state = IN_ELSE; } while (pch_char(new) == '!') { fputs(pfetch(new), ofp); new++; } } else { if (pch_char(new) != ' ') fatal("Internal error: expected ' '\n"); old++; new++; if (do_defines && def_state != OUTSIDE) { fputs(end_defined, ofp); def_state = OUTSIDE; } } } if (new <= pat_end && pch_char(new) == '+') { copy_till(where + old - 1, false); if (do_defines) { if (def_state == OUTSIDE) { fputs(if_defined, ofp); def_state = IN_IFDEF; } else if (def_state == IN_IFNDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } } while (new <= pat_end && pch_char(new) == '+') { fputs(pfetch(new), ofp); new++; } } if (do_defines && def_state != OUTSIDE) { fputs(end_defined, ofp); } } /* * Open the new file. */ static void init_output(const char *name) { ofp = fopen(name, "w"); if (ofp == NULL) pfatal("can't create %s", name); } /* * Open a file to put hunks we can't locate. */ static void init_reject(const char *name) { rejfp = fopen(name, "w"); if (rejfp == NULL) pfatal("can't create %s", name); } /* * Copy input file to output, up to wherever hunk is to be applied. * If endoffile is true, treat the last line specially since it may * lack a newline. */ static void copy_till(LINENUM lastline, bool endoffile) { if (last_frozen_line > lastline) fatal("misordered hunks! output would be garbled\n"); while (last_frozen_line < lastline) { if (++last_frozen_line == lastline && endoffile) dump_line(last_frozen_line, !last_line_missing_eol); else dump_line(last_frozen_line, true); } } /* * Finish copying the input file to the output file. */ static bool spew_output(void) { int rv; #ifdef DEBUGGING if (debug & 256) say("il=%ld lfl=%ld\n", input_lines, last_frozen_line); #endif if (input_lines) copy_till(input_lines, true); /* dump remainder of file */ rv = ferror(ofp) == 0 && fclose(ofp) == 0; ofp = NULL; return rv; } /* * Copy one line from input to output. */ static void dump_line(LINENUM line, bool write_newline) { char *s; s = ifetch(line, 0); if (s == NULL) return; /* Note: string is not NUL terminated. */ for (; *s != '\n'; s++) putc(*s, ofp); if (write_newline) putc('\n', ofp); } /* * Does the patch pattern match at line base+offset? */ static bool patch_match(LINENUM base, LINENUM offset, LINENUM fuzz) { LINENUM pline = 1 + fuzz; LINENUM iline; LINENUM pat_lines = pch_ptrn_lines() - fuzz; const char *ilineptr; const char *plineptr; unsigned short plinelen; /* Patch does not match if we don't have any more context to use */ if (pline > pat_lines) return false; for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) { ilineptr = ifetch(iline, offset >= 0); if (ilineptr == NULL) return false; plineptr = pfetch(pline); plinelen = pch_line_len(pline); if (canonicalize) { if (!similar(ilineptr, plineptr, plinelen)) return false; } else if (strnNE(ilineptr, plineptr, plinelen)) return false; if (iline == input_lines) { /* * We are looking at the last line of the file. * If the file has no eol, the patch line should * not have one either and vice-versa. Note that * plinelen > 0. */ if (last_line_missing_eol) { if (plineptr[plinelen - 1] == '\n') return false; } else { if (plineptr[plinelen - 1] != '\n') return false; } } } return true; } /* * Do two lines match with canonicalized white space? */ static bool similar(const char *a, const char *b, int len) { while (len) { if (isspace((unsigned char)*b)) { /* whitespace (or \n) to match? */ if (!isspace((unsigned char)*a)) /* no corresponding whitespace? */ return false; while (len && isspace((unsigned char)*b) && *b != '\n') b++, len--; /* skip pattern whitespace */ while (isspace((unsigned char)*a) && *a != '\n') a++; /* skip target whitespace */ if (*a == '\n' || *b == '\n') return (*a == *b); /* should end in sync */ } else if (*a++ != *b++) /* match non-whitespace chars */ return false; else len--; /* probably not necessary */ } return true; /* actually, this is not reached */ /* since there is always a \n */ } Index: stable/11/usr.bin/patch/pch.c =================================================================== --- stable/11/usr.bin/patch/pch.c (revision 345877) +++ stable/11/usr.bin/patch/pch.c (revision 345878) @@ -1,1636 +1,1639 @@ /*- * Copyright 1986, Larry Wall * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * patch - a program to apply diffs to original files * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * * $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $ * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include #include #include "common.h" #include "util.h" #include "pch.h" #include "pathnames.h" /* Patch (diff listing) abstract type. */ static off_t p_filesize; /* size of the patch file */ static LINENUM p_first; /* 1st line number */ static LINENUM p_newfirst; /* 1st line number of replacement */ static LINENUM p_ptrn_lines; /* # lines in pattern */ static LINENUM p_repl_lines; /* # lines in replacement text */ static LINENUM p_end = -1; /* last line in hunk */ static LINENUM p_max; /* max allowed value of p_end */ static LINENUM p_context = 3; /* # of context lines */ static LINENUM p_input_line = 0; /* current line # from patch file */ static char **p_line = NULL;/* the text of the hunk */ static unsigned short *p_len = NULL; /* length of each line */ static char *p_char = NULL; /* +, -, and ! */ static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */ static int p_indent; /* indent to patch */ static off_t p_base; /* where to intuit this time */ static LINENUM p_bline; /* line # of p_base */ static off_t p_start; /* where intuit found a patch */ static LINENUM p_sline; /* and the line number for it */ static LINENUM p_hunk_beg; /* line number of current hunk */ static LINENUM p_efake = -1; /* end of faked up lines--don't free */ static LINENUM p_bfake = -1; /* beg of faked up lines */ static FILE *pfp = NULL; /* patch file pointer */ static char *bestguess = NULL; /* guess at correct filename */ static void grow_hunkmax(void); static int intuit_diff_type(void); static void next_intuit_at(off_t, LINENUM); static void skip_to(off_t, LINENUM); static size_t pgets(bool _do_indent); static char *best_name(const struct file_name *, bool); static char *posix_name(const struct file_name *, bool); static size_t num_components(const char *); static LINENUM strtolinenum(char *, char **); /* * Prepare to look for the next patch in the patch file. */ void re_patch(void) { p_first = 0; p_newfirst = 0; p_ptrn_lines = 0; p_repl_lines = 0; p_end = (LINENUM) - 1; p_max = 0; p_indent = 0; } /* * Open the patch file at the beginning of time. */ void open_patch_file(const char *filename) { struct stat filestat; int nr, nw; if (filename == NULL || *filename == '\0' || strEQ(filename, "-")) { pfp = fopen(TMPPATNAME, "w"); if (pfp == NULL) pfatal("can't create %s", TMPPATNAME); while ((nr = fread(buf, 1, buf_size, stdin)) > 0) { nw = fwrite(buf, 1, nr, pfp); if (nr != nw) pfatal("write error to %s", TMPPATNAME); } if (ferror(pfp) || fclose(pfp)) pfatal("can't write %s", TMPPATNAME); filename = TMPPATNAME; } pfp = fopen(filename, "r"); if (pfp == NULL) pfatal("patch file %s not found", filename); if (fstat(fileno(pfp), &filestat)) pfatal("can't stat %s", filename); p_filesize = filestat.st_size; next_intuit_at(0, 1L); /* start at the beginning */ set_hunkmax(); } /* * Make sure our dynamically realloced tables are malloced to begin with. */ void set_hunkmax(void) { if (p_line == NULL) p_line = malloc(hunkmax * sizeof(char *)); if (p_len == NULL) p_len = malloc(hunkmax * sizeof(unsigned short)); if (p_char == NULL) p_char = malloc(hunkmax * sizeof(char)); } /* * Enlarge the arrays containing the current hunk of patch. */ static void grow_hunkmax(void) { int new_hunkmax = hunkmax * 2; if (p_line == NULL || p_len == NULL || p_char == NULL) fatal("Internal memory allocation error\n"); p_line = reallocf(p_line, new_hunkmax * sizeof(char *)); p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short)); p_char = reallocf(p_char, new_hunkmax * sizeof(char)); if (p_line != NULL && p_len != NULL && p_char != NULL) { hunkmax = new_hunkmax; return; } if (!using_plan_a) fatal("out of memory\n"); out_of_mem = true; /* whatever is null will be allocated again */ /* from within plan_a(), of all places */ } /* True if the remainder of the patch file contains a diff of some sort. */ bool there_is_another_patch(void) { bool exists = false; if (p_base != 0 && p_base >= p_filesize) { if (verbose) say("done\n"); return false; } + if (p_filesize == 0) + return false; + nonempty_patchf_seen = true; if (verbose) say("Hmm..."); diff_type = intuit_diff_type(); if (!diff_type) { if (p_base != 0) { if (verbose) say(" Ignoring the trailing garbage.\ndone\n"); } else say(" I can't seem to find a patch in there anywhere.\n"); return false; } if (verbose) say(" %sooks like %s to me...\n", (p_base == 0 ? "L" : "The next patch l"), diff_type == UNI_DIFF ? "a unified diff" : diff_type == CONTEXT_DIFF ? "a context diff" : diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" : diff_type == NORMAL_DIFF ? "a normal diff" : "an ed script"); if (p_indent && verbose) say("(Patch is indented %d space%s.)\n", p_indent, p_indent == 1 ? "" : "s"); skip_to(p_start, p_sline); while (filearg[0] == NULL) { if (force || batch) { say("No file to patch. Skipping...\n"); filearg[0] = xstrdup(bestguess); skip_rest_of_patch = true; return true; } ask("File to patch: "); if (*buf != '\n') { free(bestguess); bestguess = xstrdup(buf); filearg[0] = fetchname(buf, &exists, 0); } if (!exists) { int def_skip = *bestguess == '\0'; ask("No file found--skip this patch? [%c] ", def_skip ? 'y' : 'n'); if (*buf == 'n' || (!def_skip && *buf != 'y')) continue; if (verbose) say("Skipping patch...\n"); free(filearg[0]); filearg[0] = fetchname(bestguess, &exists, 0); skip_rest_of_patch = true; return true; } } return true; } static void p4_fetchname(struct file_name *name, char *str) { char *t, *h; /* Skip leading whitespace. */ while (isspace((unsigned char)*str)) str++; /* Remove the file revision number. */ for (t = str, h = NULL; *t != '\0' && !isspace((unsigned char)*t); t++) if (*t == '#') h = t; if (h != NULL) *h = '\0'; name->path = fetchname(str, &name->exists, strippath); } /* Determine what kind of diff is in the remaining part of the patch file. */ static int intuit_diff_type(void) { off_t this_line = 0, previous_line; off_t first_command_line = -1; LINENUM fcl_line = -1; bool last_line_was_command = false, this_is_a_command = false; bool stars_last_line = false, stars_this_line = false; char *s, *t; int indent, retval; struct file_name names[MAX_FILE]; int piece_of_git = 0; memset(names, 0, sizeof(names)); ok_to_create_file = false; fseeko(pfp, p_base, SEEK_SET); p_input_line = p_bline - 1; for (;;) { previous_line = this_line; last_line_was_command = this_is_a_command; stars_last_line = stars_this_line; this_line = ftello(pfp); indent = 0; p_input_line++; if (pgets(false) == 0) { if (first_command_line >= 0) { /* nothing but deletes!? */ p_start = first_command_line; p_sline = fcl_line; retval = ED_DIFF; goto scan_exit; } else { p_start = this_line; p_sline = p_input_line; retval = 0; goto scan_exit; } } for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) { if (*s == '\t') indent += 8 - (indent % 8); else indent++; } for (t = s; isdigit((unsigned char)*t) || *t == ','; t++) ; this_is_a_command = (isdigit((unsigned char)*s) && (*t == 'd' || *t == 'c' || *t == 'a')); if (first_command_line < 0 && this_is_a_command) { first_command_line = this_line; fcl_line = p_input_line; p_indent = indent; /* assume this for now */ } if (!stars_last_line && strnEQ(s, "*** ", 4)) names[OLD_FILE].path = fetchname(s + 4, &names[OLD_FILE].exists, strippath); else if (strnEQ(s, "--- ", 4)) { size_t off = 4; if (piece_of_git && strippath == 957 && strnEQ(s, "--- a/", 6)) off = 6; names[NEW_FILE].path = fetchname(s + off, &names[NEW_FILE].exists, strippath); } else if (strnEQ(s, "+++ ", 4)) { /* pretend it is the old name */ size_t off = 4; if (piece_of_git && strippath == 957 && strnEQ(s, "+++ b/", 6)) off = 6; names[OLD_FILE].path = fetchname(s + off, &names[OLD_FILE].exists, strippath); } else if (strnEQ(s, "Index:", 6)) names[INDEX_FILE].path = fetchname(s + 6, &names[INDEX_FILE].exists, strippath); else if (strnEQ(s, "Prereq:", 7)) { for (t = s + 7; isspace((unsigned char)*t); t++) ; revision = xstrdup(t); for (t = revision; *t && !isspace((unsigned char)*t); t++) ; *t = '\0'; if (*revision == '\0') { free(revision); revision = NULL; } } else if (strnEQ(s, "diff --git a/", 13)) { /* Git-style diffs. */ piece_of_git = 1; } else if (strnEQ(s, "==== ", 5)) { /* Perforce-style diffs. */ if ((t = strstr(s + 5, " - ")) != NULL) p4_fetchname(&names[NEW_FILE], t + 3); p4_fetchname(&names[OLD_FILE], s + 5); } if ((!diff_type || diff_type == ED_DIFF) && first_command_line >= 0 && strEQ(s, ".\n")) { p_indent = indent; p_start = first_command_line; p_sline = fcl_line; retval = ED_DIFF; goto scan_exit; } if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) { if (strnEQ(s + 4, "0,0", 3)) ok_to_create_file = true; p_indent = indent; p_start = this_line; p_sline = p_input_line; retval = UNI_DIFF; goto scan_exit; } stars_this_line = strnEQ(s, "********", 8); if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line && strnEQ(s, "*** ", 4)) { if (strtolinenum(s + 4, &s) == 0) ok_to_create_file = true; /* * If this is a new context diff the character just * at the end of the line is a '*'. */ while (*s && *s != '\n') s++; p_indent = indent; p_start = previous_line; p_sline = p_input_line - 1; retval = (*(s - 1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF); goto scan_exit; } if ((!diff_type || diff_type == NORMAL_DIFF) && last_line_was_command && (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2))) { p_start = previous_line; p_sline = p_input_line - 1; p_indent = indent; retval = NORMAL_DIFF; goto scan_exit; } } scan_exit: if (retval == UNI_DIFF) { /* unswap old and new */ struct file_name tmp = names[OLD_FILE]; names[OLD_FILE] = names[NEW_FILE]; names[NEW_FILE] = tmp; } if (filearg[0] == NULL) { if (posix) filearg[0] = posix_name(names, ok_to_create_file); else { /* Ignore the Index: name for context diffs, like GNU */ if (names[OLD_FILE].path != NULL || names[NEW_FILE].path != NULL) { free(names[INDEX_FILE].path); names[INDEX_FILE].path = NULL; } filearg[0] = best_name(names, ok_to_create_file); } } free(bestguess); bestguess = NULL; if (filearg[0] != NULL) bestguess = xstrdup(filearg[0]); else if (!ok_to_create_file) { /* * We don't want to create a new file but we need a * filename to set bestguess. Avoid setting filearg[0] * so the file is not created automatically. */ if (posix) bestguess = posix_name(names, true); else bestguess = best_name(names, true); } free(names[OLD_FILE].path); free(names[NEW_FILE].path); free(names[INDEX_FILE].path); return retval; } /* * Remember where this patch ends so we know where to start up again. */ static void next_intuit_at(off_t file_pos, LINENUM file_line) { p_base = file_pos; p_bline = file_line; } /* * Basically a verbose fseeko() to the actual diff listing. */ static void skip_to(off_t file_pos, LINENUM file_line) { size_t len; if (p_base > file_pos) fatal("Internal error: seek %lld>%lld\n", (long long)p_base, (long long)file_pos); if (verbose && p_base < file_pos) { fseeko(pfp, p_base, SEEK_SET); say("The text leading up to this was:\n--------------------------\n"); while (ftello(pfp) < file_pos) { len = pgets(false); if (len == 0) fatal("Unexpected end of file\n"); say("|%s", buf); } say("--------------------------\n"); } else fseeko(pfp, file_pos, SEEK_SET); p_input_line = file_line - 1; } /* Make this a function for better debugging. */ static void malformed(void) { fatal("malformed patch at line %ld: %s", p_input_line, buf); /* about as informative as "Syntax error" in C */ } /* * True if the line has been discarded (i.e. it is a line saying * "\ No newline at end of file".) */ static bool remove_special_line(void) { int c; c = fgetc(pfp); if (c == '\\') { do { c = fgetc(pfp); } while (c != EOF && c != '\n'); return true; } if (c != EOF) fseeko(pfp, -1, SEEK_CUR); return false; } /* * True if there is more of the current diff listing to process. */ bool another_hunk(void) { off_t line_beginning; /* file pos of the current line */ LINENUM repl_beginning; /* index of --- line */ LINENUM fillcnt; /* #lines of missing ptrn or repl */ LINENUM fillsrc; /* index of first line to copy */ LINENUM filldst; /* index of first missing line */ bool ptrn_spaces_eaten; /* ptrn was slightly malformed */ bool repl_could_be_missing; /* no + or ! lines in this hunk */ bool repl_missing; /* we are now backtracking */ off_t repl_backtrack_position; /* file pos of first repl line */ LINENUM repl_patch_line; /* input line number for same */ LINENUM ptrn_copiable; /* # of copiable lines in ptrn */ char *s; size_t len; int context = 0; while (p_end >= 0) { if (p_end == p_efake) p_end = p_bfake; /* don't free twice */ else free(p_line[p_end]); p_end--; } p_efake = -1; p_max = hunkmax; /* gets reduced when --- found */ if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) { line_beginning = ftello(pfp); repl_beginning = 0; fillcnt = 0; fillsrc = 0; filldst = 0; ptrn_spaces_eaten = false; repl_could_be_missing = true; repl_missing = false; repl_backtrack_position = 0; repl_patch_line = 0; ptrn_copiable = 0; len = pgets(true); p_input_line++; if (len == 0 || strnNE(buf, "********", 8)) { next_intuit_at(line_beginning, p_input_line); return false; } p_context = 100; p_hunk_beg = p_input_line + 1; while (p_end < p_max) { line_beginning = ftello(pfp); len = pgets(true); p_input_line++; if (len == 0) { if (p_max - p_end < 4) { /* assume blank lines got chopped */ strlcpy(buf, " \n", buf_size); } else { if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } fatal("unexpected end of file in patch\n"); } } p_end++; if (p_end >= hunkmax) fatal("Internal error: hunk larger than hunk " "buffer size"); p_char[p_end] = *buf; p_line[p_end] = NULL; switch (*buf) { case '*': if (strnEQ(buf, "********", 8)) { if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } else fatal("unexpected end of hunk " "at line %ld\n", p_input_line); } if (p_end != 0) { if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } fatal("unexpected *** at line %ld: %s", p_input_line, buf); } context = 0; p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return false; } for (s = buf; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); if (strnEQ(s, "0,0", 3)) memmove(s, s + 2, strlen(s + 2) + 1); p_first = strtolinenum(s, &s); if (*s == ',') { for (; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); p_ptrn_lines = strtolinenum(s, &s) - p_first + 1; if (p_ptrn_lines < 0) malformed(); } else if (p_first) p_ptrn_lines = 1; else { p_ptrn_lines = 0; p_first = 1; } if (p_first >= LINENUM_MAX - p_ptrn_lines || p_ptrn_lines >= LINENUM_MAX - 6) malformed(); /* we need this much at least */ p_max = p_ptrn_lines + 6; while (p_max >= hunkmax) grow_hunkmax(); p_max = hunkmax; break; case '-': if (buf[1] == '-') { if (repl_beginning || (p_end != p_ptrn_lines + 1 + (p_char[p_end - 1] == '\n'))) { if (p_end == 1) { /* * `old' lines were omitted; * set up to fill them in * from 'new' context lines. */ p_end = p_ptrn_lines + 1; fillsrc = p_end + 1; filldst = 1; fillcnt = p_ptrn_lines; } else { if (repl_beginning) { if (repl_could_be_missing) { repl_missing = true; goto hunk_done; } fatal("duplicate \"---\" at line %ld--check line numbers at line %ld\n", p_input_line, p_hunk_beg + repl_beginning); } else { fatal("%s \"---\" at line %ld--check line numbers at line %ld\n", (p_end <= p_ptrn_lines ? "Premature" : "Overdue"), p_input_line, p_hunk_beg); } } } repl_beginning = p_end; repl_backtrack_position = ftello(pfp); repl_patch_line = p_input_line; p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return false; } p_char[p_end] = '='; for (s = buf; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); p_newfirst = strtolinenum(s, &s); if (*s == ',') { for (; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); p_repl_lines = strtolinenum(s, &s) - p_newfirst + 1; if (p_repl_lines < 0) malformed(); } else if (p_newfirst) p_repl_lines = 1; else { p_repl_lines = 0; p_newfirst = 1; } if (p_newfirst >= LINENUM_MAX - p_repl_lines || p_repl_lines >= LINENUM_MAX - p_end) malformed(); p_max = p_repl_lines + p_end; if (p_max > MAXHUNKSIZE) fatal("hunk too large (%ld lines) at line %ld: %s", p_max, p_input_line, buf); while (p_max >= hunkmax) grow_hunkmax(); if (p_repl_lines != ptrn_copiable && (p_context != 0 || p_repl_lines != 1)) repl_could_be_missing = false; break; } goto change_line; case '+': case '!': repl_could_be_missing = false; change_line: if (buf[1] == '\n' && canonicalize) strlcpy(buf + 1, " \n", buf_size - 1); if (!isspace((unsigned char)buf[1]) && buf[1] != '>' && buf[1] != '<' && repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } if (context >= 0) { if (context < p_context) p_context = context; context = -1000; } p_line[p_end] = savestr(buf + 2); if (out_of_mem) { p_end--; return false; } if (p_end == p_ptrn_lines) { if (remove_special_line()) { int l; l = strlen(p_line[p_end]) - 1; (p_line[p_end])[l] = 0; } } break; case '\t': case '\n': /* assume the 2 spaces got eaten */ if (repl_beginning && repl_could_be_missing && (!ptrn_spaces_eaten || diff_type == NEW_CONTEXT_DIFF)) { repl_missing = true; goto hunk_done; } p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return false; } if (p_end != p_ptrn_lines + 1) { ptrn_spaces_eaten |= (repl_beginning != 0); context++; if (!repl_beginning) ptrn_copiable++; p_char[p_end] = ' '; } break; case ' ': if (!isspace((unsigned char)buf[1]) && repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } context++; if (!repl_beginning) ptrn_copiable++; p_line[p_end] = savestr(buf + 2); if (out_of_mem) { p_end--; return false; } break; default: if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } malformed(); } /* set up p_len for strncmp() so we don't have to */ /* assume null termination */ if (p_line[p_end]) p_len[p_end] = strlen(p_line[p_end]); else p_len[p_end] = 0; } hunk_done: if (p_end >= 0 && !repl_beginning) fatal("no --- found in patch at line %ld\n", pch_hunk_beg()); if (repl_missing) { /* reset state back to just after --- */ p_input_line = repl_patch_line; for (p_end--; p_end > repl_beginning; p_end--) free(p_line[p_end]); fseeko(pfp, repl_backtrack_position, SEEK_SET); /* redundant 'new' context lines were omitted - set */ /* up to fill them in from the old file context */ if (!p_context && p_repl_lines == 1) { p_repl_lines = 0; p_max--; } fillsrc = 1; filldst = repl_beginning + 1; fillcnt = p_repl_lines; p_end = p_max; } else if (!p_context && fillcnt == 1) { /* the first hunk was a null hunk with no context */ /* and we were expecting one line -- fix it up. */ while (filldst < p_end) { p_line[filldst] = p_line[filldst + 1]; p_char[filldst] = p_char[filldst + 1]; p_len[filldst] = p_len[filldst + 1]; filldst++; } #if 0 repl_beginning--; /* this doesn't need to be fixed */ #endif p_end--; p_first++; /* do append rather than insert */ fillcnt = 0; p_ptrn_lines = 0; } if (diff_type == CONTEXT_DIFF && (fillcnt || (p_first > 1 && ptrn_copiable > 2 * p_context))) { if (verbose) say("%s\n%s\n%s\n", "(Fascinating--this is really a new-style context diff but without", "the telltale extra asterisks on the *** line that usually indicate", "the new style...)"); diff_type = NEW_CONTEXT_DIFF; } /* if there were omitted context lines, fill them in now */ if (fillcnt) { p_bfake = filldst; /* remember where not to free() */ p_efake = filldst + fillcnt - 1; while (fillcnt-- > 0) { while (fillsrc <= p_end && p_char[fillsrc] != ' ') fillsrc++; if (fillsrc > p_end) fatal("replacement text or line numbers mangled in hunk at line %ld\n", p_hunk_beg); p_line[filldst] = p_line[fillsrc]; p_char[filldst] = p_char[fillsrc]; p_len[filldst] = p_len[fillsrc]; fillsrc++; filldst++; } while (fillsrc <= p_end && fillsrc != repl_beginning && p_char[fillsrc] != ' ') fillsrc++; #ifdef DEBUGGING if (debug & 64) printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n", fillsrc, filldst, repl_beginning, p_end + 1); #endif if (fillsrc != p_end + 1 && fillsrc != repl_beginning) malformed(); if (filldst != p_end + 1 && filldst != repl_beginning) malformed(); } if (p_line[p_end] != NULL) { if (remove_special_line()) { p_len[p_end] -= 1; (p_line[p_end])[p_len[p_end]] = 0; } } } else if (diff_type == UNI_DIFF) { LINENUM fillold; /* index of old lines */ LINENUM fillnew; /* index of new lines */ char ch; line_beginning = ftello(pfp); /* file pos of the current line */ len = pgets(true); p_input_line++; if (len == 0 || strnNE(buf, "@@ -", 4)) { next_intuit_at(line_beginning, p_input_line); return false; } s = buf + 4; if (!*s) malformed(); p_first = strtolinenum(s, &s); if (*s == ',') { p_ptrn_lines = strtolinenum(s + 1, &s); } else p_ptrn_lines = 1; if (*s == ' ') s++; if (*s != '+' || !*++s) malformed(); p_newfirst = strtolinenum(s, &s); if (*s == ',') { p_repl_lines = strtolinenum(s + 1, &s); } else p_repl_lines = 1; if (*s == ' ') s++; if (*s != '@') malformed(); if (p_first >= LINENUM_MAX - p_ptrn_lines || p_newfirst > LINENUM_MAX - p_repl_lines || p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1) malformed(); if (!p_ptrn_lines) p_first++; /* do append rather than insert */ p_max = p_ptrn_lines + p_repl_lines + 1; while (p_max >= hunkmax) grow_hunkmax(); fillold = 1; fillnew = fillold + p_ptrn_lines; p_end = fillnew + p_repl_lines; snprintf(buf, buf_size, "*** %ld,%ld ****\n", p_first, p_first + p_ptrn_lines - 1); p_line[0] = savestr(buf); if (out_of_mem) { p_end = -1; return false; } p_char[0] = '*'; snprintf(buf, buf_size, "--- %ld,%ld ----\n", p_newfirst, p_newfirst + p_repl_lines - 1); p_line[fillnew] = savestr(buf); if (out_of_mem) { p_end = 0; return false; } p_char[fillnew++] = '='; p_context = 100; context = 0; p_hunk_beg = p_input_line + 1; while (fillold <= p_ptrn_lines || fillnew <= p_end) { line_beginning = ftello(pfp); len = pgets(true); p_input_line++; if (len == 0) { if (p_max - fillnew < 3) { /* assume blank lines got chopped */ strlcpy(buf, " \n", buf_size); } else { fatal("unexpected end of file in patch\n"); } } if (*buf == '\t' || *buf == '\n') { ch = ' '; /* assume the space got eaten */ s = savestr(buf); } else { ch = *buf; s = savestr(buf + 1); } if (out_of_mem) { while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; return false; } switch (ch) { case '-': if (fillold > p_ptrn_lines) { free(s); p_end = fillnew - 1; malformed(); } p_char[fillold] = ch; p_line[fillold] = s; p_len[fillold++] = strlen(s); if (fillold > p_ptrn_lines) { if (remove_special_line()) { p_len[fillold - 1] -= 1; s[p_len[fillold - 1]] = 0; } } break; case '=': ch = ' '; /* FALL THROUGH */ case ' ': if (fillold > p_ptrn_lines) { free(s); while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; malformed(); } context++; p_char[fillold] = ch; p_line[fillold] = s; p_len[fillold++] = strlen(s); s = savestr(s); if (out_of_mem) { while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; return false; } if (fillold > p_ptrn_lines) { if (remove_special_line()) { p_len[fillold - 1] -= 1; s[p_len[fillold - 1]] = 0; } } /* FALL THROUGH */ case '+': if (fillnew > p_end) { free(s); while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; malformed(); } p_char[fillnew] = ch; p_line[fillnew] = s; p_len[fillnew++] = strlen(s); if (fillold > p_ptrn_lines) { if (remove_special_line()) { p_len[fillnew - 1] -= 1; s[p_len[fillnew - 1]] = 0; } } break; default: p_end = fillnew; malformed(); } if (ch != ' ' && context > 0) { if (context < p_context) p_context = context; context = -1000; } } /* while */ } else { /* normal diff--fake it up */ char hunk_type; int i; LINENUM min, max; line_beginning = ftello(pfp); p_context = 0; len = pgets(true); p_input_line++; if (len == 0 || !isdigit((unsigned char)*buf)) { next_intuit_at(line_beginning, p_input_line); return false; } p_first = strtolinenum(buf, &s); if (*s == ',') { p_ptrn_lines = strtolinenum(s + 1, &s) - p_first + 1; if (p_ptrn_lines < 0) malformed(); } else p_ptrn_lines = (*s != 'a'); hunk_type = *s; if (hunk_type == 'a') p_first++; /* do append rather than insert */ min = strtolinenum(s + 1, &s); if (*s == ',') max = strtolinenum(s + 1, &s); else max = min; if (min < 0 || min > max || max - min == LINENUM_MAX) malformed(); if (hunk_type == 'd') min++; p_newfirst = min; p_repl_lines = max - min + 1; if (p_newfirst > LINENUM_MAX - p_repl_lines || p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1) malformed(); p_end = p_ptrn_lines + p_repl_lines + 1; if (p_end > MAXHUNKSIZE) fatal("hunk too large (%ld lines) at line %ld: %s", p_end, p_input_line, buf); while (p_end >= hunkmax) grow_hunkmax(); snprintf(buf, buf_size, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1); p_line[0] = savestr(buf); if (out_of_mem) { p_end = -1; return false; } p_char[0] = '*'; for (i = 1; i <= p_ptrn_lines; i++) { len = pgets(true); p_input_line++; if (len == 0) fatal("unexpected end of file in patch at line %ld\n", p_input_line); if (*buf != '<') fatal("< expected at line %ld of patch\n", p_input_line); p_line[i] = savestr(buf + 2); if (out_of_mem) { p_end = i - 1; return false; } p_len[i] = strlen(p_line[i]); p_char[i] = '-'; } if (remove_special_line()) { p_len[i - 1] -= 1; (p_line[i - 1])[p_len[i - 1]] = 0; } if (hunk_type == 'c') { len = pgets(true); p_input_line++; if (len == 0) fatal("unexpected end of file in patch at line %ld\n", p_input_line); if (*buf != '-') fatal("--- expected at line %ld of patch\n", p_input_line); } snprintf(buf, buf_size, "--- %ld,%ld\n", min, max); p_line[i] = savestr(buf); if (out_of_mem) { p_end = i - 1; return false; } p_char[i] = '='; for (i++; i <= p_end; i++) { len = pgets(true); p_input_line++; if (len == 0) fatal("unexpected end of file in patch at line %ld\n", p_input_line); if (*buf != '>') fatal("> expected at line %ld of patch\n", p_input_line); /* Don't overrun if we don't have enough line */ if (len > 2) p_line[i] = savestr(buf + 2); else p_line[i] = savestr(""); if (out_of_mem) { p_end = i - 1; return false; } p_len[i] = strlen(p_line[i]); p_char[i] = '+'; } if (remove_special_line()) { p_len[i - 1] -= 1; (p_line[i - 1])[p_len[i - 1]] = 0; } } if (reverse) /* backwards patch? */ if (!pch_swap()) say("Not enough memory to swap next hunk!\n"); #ifdef DEBUGGING if (debug & 2) { LINENUM i; char special; for (i = 0; i <= p_end; i++) { if (i == p_ptrn_lines) special = '^'; else special = ' '; fprintf(stderr, "%3ld %c %c %s", i, p_char[i], special, p_line[i]); fflush(stderr); } } #endif if (p_end + 1 < hunkmax)/* paranoia reigns supreme... */ p_char[p_end + 1] = '^'; /* add a stopper for apply_hunk */ return true; } /* * Input a line from the patch file. * Worry about indentation if do_indent is true. * The line is read directly into the buf global variable which * is resized if necessary in order to hold the complete line. * Returns the number of characters read including the terminating * '\n', if any. */ size_t pgets(bool do_indent) { char *line; size_t len; int indent = 0, skipped = 0; line = fgetln(pfp, &len); if (line != NULL) { if (len + 1 > buf_size) { while (len + 1 > buf_size) buf_size *= 2; free(buf); buf = malloc(buf_size); if (buf == NULL) fatal("out of memory\n"); } if (do_indent == 1 && p_indent) { for (; indent < p_indent && (*line == ' ' || *line == '\t' || *line == 'X'); line++, skipped++) { if (*line == '\t') indent += 8 - (indent %7); else indent++; } } memcpy(buf, line, len - skipped); buf[len - skipped] = '\0'; } return len; } /* * Reverse the old and new portions of the current hunk. */ bool pch_swap(void) { char **tp_line; /* the text of the hunk */ unsigned short *tp_len;/* length of each line */ char *tp_char; /* +, -, and ! */ LINENUM i; LINENUM n; bool blankline = false; char *s; i = p_first; p_first = p_newfirst; p_newfirst = i; /* make a scratch copy */ tp_line = p_line; tp_len = p_len; tp_char = p_char; p_line = NULL; /* force set_hunkmax to allocate again */ p_len = NULL; p_char = NULL; set_hunkmax(); if (p_line == NULL || p_len == NULL || p_char == NULL) { free(p_line); p_line = tp_line; free(p_len); p_len = tp_len; free(p_char); p_char = tp_char; return false; /* not enough memory to swap hunk! */ } /* now turn the new into the old */ i = p_ptrn_lines + 1; if (tp_char[i] == '\n') { /* account for possible blank line */ blankline = true; i++; } if (p_efake >= 0) { /* fix non-freeable ptr range */ if (p_efake <= i) n = p_end - i + 1; else n = -i; p_efake += n; p_bfake += n; } for (n = 0; i <= p_end; i++, n++) { p_line[n] = tp_line[i]; p_char[n] = tp_char[i]; if (p_char[n] == '+') p_char[n] = '-'; p_len[n] = tp_len[i]; } if (blankline) { i = p_ptrn_lines + 1; p_line[n] = tp_line[i]; p_char[n] = tp_char[i]; p_len[n] = tp_len[i]; n++; } if (p_char[0] != '=') fatal("Malformed patch at line %ld: expected '=' found '%c'\n", p_input_line, p_char[0]); p_char[0] = '*'; for (s = p_line[0]; *s; s++) if (*s == '-') *s = '*'; /* now turn the old into the new */ if (p_char[0] != '*') fatal("Malformed patch at line %ld: expected '*' found '%c'\n", p_input_line, p_char[0]); tp_char[0] = '='; for (s = tp_line[0]; *s; s++) if (*s == '*') *s = '-'; for (i = 0; n <= p_end; i++, n++) { p_line[n] = tp_line[i]; p_char[n] = tp_char[i]; if (p_char[n] == '-') p_char[n] = '+'; p_len[n] = tp_len[i]; } if (i != p_ptrn_lines + 1) fatal("Malformed patch at line %ld: expected %ld lines, " "got %ld\n", p_input_line, p_ptrn_lines + 1, i); i = p_ptrn_lines; p_ptrn_lines = p_repl_lines; p_repl_lines = i; free(tp_line); free(tp_len); free(tp_char); return true; } /* * Return the specified line position in the old file of the old context. */ LINENUM pch_first(void) { return p_first; } /* * Return the number of lines of old context. */ LINENUM pch_ptrn_lines(void) { return p_ptrn_lines; } /* * Return the probable line position in the new file of the first line. */ LINENUM pch_newfirst(void) { return p_newfirst; } /* * Return the number of lines in the replacement text including context. */ LINENUM pch_repl_lines(void) { return p_repl_lines; } /* * Return the number of lines in the whole hunk. */ LINENUM pch_end(void) { return p_end; } /* * Return the number of context lines before the first changed line. */ LINENUM pch_context(void) { return p_context; } /* * Return the length of a particular patch line. */ unsigned short pch_line_len(LINENUM line) { return p_len[line]; } /* * Return the control character (+, -, *, !, etc) for a patch line. */ char pch_char(LINENUM line) { return p_char[line]; } /* * Return a pointer to a particular patch line. */ char * pfetch(LINENUM line) { return p_line[line]; } /* * Return where in the patch file this hunk began, for error messages. */ LINENUM pch_hunk_beg(void) { return p_hunk_beg; } /* * Apply an ed script by feeding ed itself. */ void do_ed_script(void) { char *t; off_t beginning_of_this_line; FILE *pipefp = NULL; int continuation; if (!skip_rest_of_patch) { if (copy_file(filearg[0], TMPOUTNAME) < 0) { unlink(TMPOUTNAME); fatal("can't create temp file %s", TMPOUTNAME); } snprintf(buf, buf_size, "%s%s%s", _PATH_RED, verbose ? " " : " -s ", TMPOUTNAME); pipefp = popen(buf, "w"); } for (;;) { beginning_of_this_line = ftello(pfp); if (pgets(true) == 0) { next_intuit_at(beginning_of_this_line, p_input_line); break; } p_input_line++; for (t = buf; isdigit((unsigned char)*t) || *t == ','; t++) ; /* POSIX defines allowed commands as {a,c,d,i,s} */ if (isdigit((unsigned char)*buf) && (*t == 'a' || *t == 'c' || *t == 'd' || *t == 'i' || *t == 's')) { if (pipefp != NULL) fputs(buf, pipefp); if (*t == 's') { for (;;) { continuation = 0; t = strchr(buf, '\0') - 1; while (--t >= buf && *t == '\\') continuation = !continuation; if (!continuation || pgets(true) == 0) break; if (pipefp != NULL) fputs(buf, pipefp); } } else if (*t != 'd') { while (pgets(true)) { p_input_line++; if (pipefp != NULL) fputs(buf, pipefp); if (strEQ(buf, ".\n")) break; } } } else { next_intuit_at(beginning_of_this_line, p_input_line); break; } } if (pipefp == NULL) return; fprintf(pipefp, "w\n"); fprintf(pipefp, "q\n"); fflush(pipefp); pclose(pipefp); ignore_signals(); if (!check_only) { if (move_file(TMPOUTNAME, outname) < 0) { toutkeep = true; chmod(TMPOUTNAME, filemode); } else chmod(outname, filemode); } set_signals(1); } /* * Choose the name of the file to be patched based on POSIX rules. * NOTE: the POSIX rules are amazingly stupid and we only follow them * if the user specified --posix or set POSIXLY_CORRECT. */ static char * posix_name(const struct file_name *names, bool assume_exists) { char *path = NULL; int i; /* * POSIX states that the filename will be chosen from one * of the old, new and index names (in that order) if * the file exists relative to CWD after -p stripping. */ for (i = 0; i < MAX_FILE; i++) { if (names[i].path != NULL && names[i].exists) { path = names[i].path; break; } } if (path == NULL && !assume_exists) { /* * No files found, check to see if the diff could be * creating a new file. */ if (path == NULL && ok_to_create_file && names[NEW_FILE].path != NULL) path = names[NEW_FILE].path; } return path ? xstrdup(path) : NULL; } static char * compare_names(const struct file_name *names, bool assume_exists) { size_t min_components, min_baselen, min_len, tmp; char *best = NULL; char *path; int i; /* * The "best" name is the one with the fewest number of path * components, the shortest basename length, and the shortest * overall length (in that order). We only use the Index: file * if neither of the old or new files could be intuited from * the diff header. */ min_components = min_baselen = min_len = SIZE_MAX; for (i = INDEX_FILE; i >= OLD_FILE; i--) { path = names[i].path; if (path == NULL || (!names[i].exists && !assume_exists)) continue; if ((tmp = num_components(path)) > min_components) continue; if (tmp < min_components) { min_components = tmp; best = path; } if ((tmp = strlen(basename(path))) > min_baselen) continue; if (tmp < min_baselen) { min_baselen = tmp; best = path; } if ((tmp = strlen(path)) > min_len) continue; min_len = tmp; best = path; } return best; } /* * Choose the name of the file to be patched based the "best" one * available. */ static char * best_name(const struct file_name *names, bool assume_exists) { char *best; best = compare_names(names, assume_exists); /* No match? Check to see if the diff could be creating a new file. */ if (best == NULL && ok_to_create_file) best = names[NEW_FILE].path; return best ? xstrdup(best) : NULL; } static size_t num_components(const char *path) { size_t n; const char *cp; for (n = 0, cp = path; (cp = strchr(cp, '/')) != NULL; n++, cp++) { while (*cp == '/') cp++; /* skip consecutive slashes */ } return n; } /* * Convert number at NPTR into LINENUM and save address of first * character that is not a digit in ENDPTR. If conversion is not * possible, call fatal. */ static LINENUM strtolinenum(char *nptr, char **endptr) { LINENUM rv; char c; char *p; const char *errstr; for (p = nptr; isdigit((unsigned char)*p); p++) ; if (p == nptr) malformed(); c = *p; *p = '\0'; rv = strtonum(nptr, 0, LINENUM_MAX, &errstr); if (errstr != NULL) fatal("invalid line number at line %ld: `%s' is %s\n", p_input_line, nptr, errstr); *p = c; *endptr = p; return rv; } Index: stable/11 =================================================================== --- stable/11 (revision 345877) +++ stable/11 (revision 345878) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r344677 Index: stable/12/usr.bin/patch/common.h =================================================================== --- stable/12/usr.bin/patch/common.h (revision 345877) +++ stable/12/usr.bin/patch/common.h (revision 345878) @@ -1,111 +1,112 @@ /*- * Copyright 1986, Larry Wall * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * patch - a program to apply diffs to original files * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * * $OpenBSD: common.h,v 1.26 2006/03/11 19:41:30 otto Exp $ * $FreeBSD$ */ #include #include #include #define DEBUGGING /* constants */ #define MAXHUNKSIZE 200000 /* is this enough lines? */ #define INITHUNKMAX 125 /* initial dynamic allocation size */ #define INITLINELEN 4096 #define BUFFERSIZE 4096 #define LINENUM_MAX LONG_MAX #define ORIGEXT ".orig" #define REJEXT ".rej" /* handy definitions */ #define strEQ(s1,s2) (strcmp(s1, s2) == 0) #define strnNE(s1,s2,l) (strncmp(s1, s2, l) != 0) #define strnEQ(s1,s2,l) (strncmp(s1, s2, l) == 0) /* typedefs */ typedef long LINENUM; /* must be signed */ /* globals */ extern mode_t filemode; extern char *buf; /* general purpose buffer */ extern size_t buf_size; /* size of general purpose buffer */ extern bool using_plan_a; /* try to keep everything in memory */ extern bool out_of_mem; /* ran out of memory in plan a */ +extern bool nonempty_patchf_seen; /* seen a non-zero-length patch file? */ #define MAXFILEC 2 extern char *filearg[MAXFILEC]; extern bool ok_to_create_file; extern char *outname; extern char *origprae; extern char *TMPOUTNAME; extern char *TMPINNAME; extern char *TMPREJNAME; extern char *TMPPATNAME; extern bool toutkeep; extern bool trejkeep; #ifdef DEBUGGING extern int debug; #endif extern bool force; extern bool batch; extern bool verbose; extern bool reverse; extern bool noreverse; extern bool skip_rest_of_patch; extern int strippath; extern bool canonicalize; /* TRUE if -C was specified on command line. */ extern bool check_only; extern bool warn_on_invalid_line; extern bool last_line_missing_eol; #define CONTEXT_DIFF 1 #define NORMAL_DIFF 2 #define ED_DIFF 3 #define NEW_CONTEXT_DIFF 4 #define UNI_DIFF 5 extern int diff_type; extern char *revision; /* prerequisite revision, if any */ extern LINENUM input_lines; /* how long is input file in lines */ extern int posix; Index: stable/12/usr.bin/patch/patch.c =================================================================== --- stable/12/usr.bin/patch/patch.c (revision 345877) +++ stable/12/usr.bin/patch/patch.c (revision 345878) @@ -1,1085 +1,1086 @@ /*- * Copyright 1986, Larry Wall * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * patch - a program to apply diffs to original files * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * * $OpenBSD: patch.c,v 1.54 2014/12/13 10:31:07 tobias Exp $ * $FreeBSD$ * */ #include #include #include #include #include #include #include #include #include #include "common.h" #include "util.h" #include "pch.h" #include "inp.h" #include "backupfile.h" #include "pathnames.h" mode_t filemode = 0644; char *buf; /* general purpose buffer */ size_t buf_size; /* size of the general purpose buffer */ bool using_plan_a = true; /* try to keep everything in memory */ bool out_of_mem = false; /* ran out of memory in plan a */ +bool nonempty_patchf_seen = false; /* seen nonempty patch file? */ #define MAXFILEC 2 char *filearg[MAXFILEC]; bool ok_to_create_file = false; char *outname = NULL; char *origprae = NULL; char *TMPOUTNAME; char *TMPINNAME; char *TMPREJNAME; char *TMPPATNAME; bool toutkeep = false; bool trejkeep = false; bool warn_on_invalid_line; bool last_line_missing_eol; #ifdef DEBUGGING int debug = 0; #endif bool force = false; bool batch = false; bool verbose = true; bool reverse = false; bool noreverse = false; bool skip_rest_of_patch = false; int strippath = 957; bool canonicalize = false; bool check_only = false; int diff_type = 0; char *revision = NULL; /* prerequisite revision, if any */ LINENUM input_lines = 0; /* how long is input file in lines */ int posix = 0; /* strict POSIX mode? */ static void reinitialize_almost_everything(void); static void get_some_switches(void); static LINENUM locate_hunk(LINENUM); static void abort_context_hunk(void); static void rej_line(int, LINENUM); static void abort_hunk(void); static void apply_hunk(LINENUM); static void init_output(const char *); static void init_reject(const char *); static void copy_till(LINENUM, bool); static bool spew_output(void); static void dump_line(LINENUM, bool); static bool patch_match(LINENUM, LINENUM, LINENUM); static bool similar(const char *, const char *, int); static void usage(void); /* true if -E was specified on command line. */ static bool remove_empty_files = false; /* true if -R was specified on command line. */ static bool reverse_flag_specified = false; static bool Vflag = false; /* buffer holding the name of the rejected patch file. */ static char rejname[PATH_MAX]; /* how many input lines have been irretractibly output */ static LINENUM last_frozen_line = 0; static int Argc; /* guess */ static char **Argv; static int Argc_last; /* for restarting plan_b */ static char **Argv_last; static FILE *ofp = NULL; /* output file pointer */ static FILE *rejfp = NULL; /* reject file pointer */ static int filec = 0; /* how many file arguments? */ static LINENUM last_offset = 0; static LINENUM maxfuzz = 2; /* patch using ifdef, ifndef, etc. */ static bool do_defines = false; /* #ifdef xyzzy */ static char if_defined[128]; /* #ifndef xyzzy */ static char not_defined[128]; /* #else */ static const char else_defined[] = "#else\n"; /* #endif xyzzy */ static char end_defined[128]; /* Apply a set of diffs as appropriate. */ int main(int argc, char *argv[]) { int error = 0, hunk, failed, i, fd; bool patch_seen, reverse_seen; LINENUM where = 0, newwhere, fuzz, mymaxfuzz; const char *tmpdir; char *v; setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stderr, NULL, _IOLBF, 0); for (i = 0; i < MAXFILEC; i++) filearg[i] = NULL; buf_size = INITLINELEN; buf = malloc((unsigned)(buf_size)); if (buf == NULL) fatal("out of memory\n"); /* Cons up the names of the temporary files. */ if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0') tmpdir = _PATH_TMP; for (i = strlen(tmpdir) - 1; i > 0 && tmpdir[i] == '/'; i--) ; i++; if (asprintf(&TMPOUTNAME, "%.*s/patchoXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPOUTNAME)) < 0) pfatal("can't create %s", TMPOUTNAME); close(fd); if (asprintf(&TMPINNAME, "%.*s/patchiXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPINNAME)) < 0) pfatal("can't create %s", TMPINNAME); close(fd); if (asprintf(&TMPREJNAME, "%.*s/patchrXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPREJNAME)) < 0) pfatal("can't create %s", TMPREJNAME); close(fd); if (asprintf(&TMPPATNAME, "%.*s/patchpXXXXXXXXXX", i, tmpdir) == -1) fatal("cannot allocate memory"); if ((fd = mkstemp(TMPPATNAME)) < 0) pfatal("can't create %s", TMPPATNAME); close(fd); v = getenv("SIMPLE_BACKUP_SUFFIX"); if (v) simple_backup_suffix = v; else simple_backup_suffix = ORIGEXT; /* parse switches */ Argc = argc; Argv = argv; get_some_switches(); if (!Vflag) { if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL) v = getenv("VERSION_CONTROL"); if (v != NULL || !posix) backup_type = get_version(v); /* OK to pass NULL. */ } /* make sure we clean up /tmp in case of disaster */ set_signals(0); patch_seen = false; for (open_patch_file(filearg[1]); there_is_another_patch(); reinitialize_almost_everything()) { /* for each patch in patch file */ patch_seen = true; warn_on_invalid_line = true; if (outname == NULL) outname = xstrdup(filearg[0]); /* for ed script just up and do it and exit */ if (diff_type == ED_DIFF) { do_ed_script(); continue; } /* initialize the patched file */ if (!skip_rest_of_patch) init_output(TMPOUTNAME); /* initialize reject file */ init_reject(TMPREJNAME); /* find out where all the lines are */ if (!skip_rest_of_patch) scan_input(filearg[0]); /* * from here on, open no standard i/o files, because * malloc might misfire and we can't catch it easily */ /* apply each hunk of patch */ hunk = 0; failed = 0; reverse_seen = false; out_of_mem = false; while (another_hunk()) { hunk++; fuzz = 0; mymaxfuzz = pch_context(); if (maxfuzz < mymaxfuzz) mymaxfuzz = maxfuzz; if (!skip_rest_of_patch) { do { where = locate_hunk(fuzz); if (hunk == 1 && where == 0 && !force && !reverse_seen) { /* dwim for reversed patch? */ if (!pch_swap()) { if (fuzz == 0) say("Not enough memory to try swapped hunk! Assuming unswapped.\n"); continue; } reverse = !reverse; /* try again */ where = locate_hunk(fuzz); if (where == 0) { /* didn't find it swapped */ if (!pch_swap()) /* put it back to normal */ fatal("lost hunk on alloc error!\n"); reverse = !reverse; } else if (noreverse) { if (!pch_swap()) /* put it back to normal */ fatal("lost hunk on alloc error!\n"); reverse = !reverse; say("Ignoring previously applied (or reversed) patch.\n"); skip_rest_of_patch = true; } else if (batch) { if (verbose) say("%seversed (or previously applied) patch detected! %s -R.", reverse ? "R" : "Unr", reverse ? "Assuming" : "Ignoring"); } else { ask("%seversed (or previously applied) patch detected! %s -R? [y] ", reverse ? "R" : "Unr", reverse ? "Assume" : "Ignore"); if (*buf == 'n') { ask("Apply anyway? [n] "); if (*buf != 'y') skip_rest_of_patch = true; else reverse_seen = true; where = 0; reverse = !reverse; if (!pch_swap()) /* put it back to normal */ fatal("lost hunk on alloc error!\n"); } } } } while (!skip_rest_of_patch && where == 0 && ++fuzz <= mymaxfuzz); if (skip_rest_of_patch) { /* just got decided */ if (ferror(ofp) || fclose(ofp)) { say("Error writing %s\n", TMPOUTNAME); error = 1; } ofp = NULL; } } newwhere = pch_newfirst() + last_offset; if (skip_rest_of_patch) { abort_hunk(); failed++; if (verbose) say("Hunk #%d ignored at %ld.\n", hunk, newwhere); } else if (where == 0) { abort_hunk(); failed++; if (verbose) say("Hunk #%d failed at %ld.\n", hunk, newwhere); } else { apply_hunk(where); if (verbose) { say("Hunk #%d succeeded at %ld", hunk, newwhere); if (fuzz != 0) say(" with fuzz %ld", fuzz); if (last_offset) say(" (offset %ld line%s)", last_offset, last_offset == 1L ? "" : "s"); say(".\n"); } } } if (out_of_mem && using_plan_a) { Argc = Argc_last; Argv = Argv_last; say("\n\nRan out of memory using Plan A--trying again...\n\n"); if (ofp) fclose(ofp); ofp = NULL; if (rejfp) fclose(rejfp); rejfp = NULL; continue; } if (hunk == 0) fatal("Internal error: hunk should not be 0\n"); /* finish spewing out the new file */ if (!skip_rest_of_patch && !spew_output()) { say("Can't write %s\n", TMPOUTNAME); error = 1; } /* and put the output where desired */ ignore_signals(); if (!skip_rest_of_patch) { struct stat statbuf; char *realout = outname; if (!check_only) { if (move_file(TMPOUTNAME, outname) < 0) { toutkeep = true; realout = TMPOUTNAME; chmod(TMPOUTNAME, filemode); } else chmod(outname, filemode); if (remove_empty_files && stat(realout, &statbuf) == 0 && statbuf.st_size == 0) { if (verbose) say("Removing %s (empty after patching).\n", realout); unlink(realout); } } } if (ferror(rejfp) || fclose(rejfp)) { say("Error writing %s\n", rejname); error = 1; } rejfp = NULL; if (failed) { error = 1; if (*rejname == '\0') { if (strlcpy(rejname, outname, sizeof(rejname)) >= sizeof(rejname)) fatal("filename %s is too long\n", outname); if (strlcat(rejname, REJEXT, sizeof(rejname)) >= sizeof(rejname)) fatal("filename %s is too long\n", outname); } if (!check_only) say("%d out of %d hunks %s--saving rejects to %s\n", failed, hunk, skip_rest_of_patch ? "ignored" : "failed", rejname); else say("%d out of %d hunks %s while patching %s\n", failed, hunk, skip_rest_of_patch ? "ignored" : "failed", filearg[0]); if (!check_only && move_file(TMPREJNAME, rejname) < 0) trejkeep = true; } set_signals(1); } - if (!patch_seen) + if (!patch_seen && nonempty_patchf_seen) error = 2; my_exit(error); /* NOTREACHED */ } /* Prepare to find the next patch to do in the patch file. */ static void reinitialize_almost_everything(void) { re_patch(); re_input(); input_lines = 0; last_frozen_line = 0; filec = 0; if (!out_of_mem) { free(filearg[0]); filearg[0] = NULL; } free(outname); outname = NULL; last_offset = 0; diff_type = 0; free(revision); revision = NULL; reverse = reverse_flag_specified; skip_rest_of_patch = false; get_some_switches(); } /* Process switches and filenames. */ static void get_some_switches(void) { const char *options = "b::B:cCd:D:eEfF:i:lnNo:p:r:RstuvV:x:z:"; static struct option longopts[] = { {"backup", no_argument, 0, 'b'}, {"batch", no_argument, 0, 't'}, {"check", no_argument, 0, 'C'}, {"context", no_argument, 0, 'c'}, {"debug", required_argument, 0, 'x'}, {"directory", required_argument, 0, 'd'}, {"dry-run", no_argument, 0, 'C'}, {"ed", no_argument, 0, 'e'}, {"force", no_argument, 0, 'f'}, {"forward", no_argument, 0, 'N'}, {"fuzz", required_argument, 0, 'F'}, {"ifdef", required_argument, 0, 'D'}, {"input", required_argument, 0, 'i'}, {"ignore-whitespace", no_argument, 0, 'l'}, {"normal", no_argument, 0, 'n'}, {"output", required_argument, 0, 'o'}, {"prefix", required_argument, 0, 'B'}, {"quiet", no_argument, 0, 's'}, {"reject-file", required_argument, 0, 'r'}, {"remove-empty-files", no_argument, 0, 'E'}, {"reverse", no_argument, 0, 'R'}, {"silent", no_argument, 0, 's'}, {"strip", required_argument, 0, 'p'}, {"suffix", required_argument, 0, 'z'}, {"unified", no_argument, 0, 'u'}, {"version", no_argument, 0, 'v'}, {"version-control", required_argument, 0, 'V'}, {"posix", no_argument, &posix, 1}, {NULL, 0, 0, 0} }; int ch; rejname[0] = '\0'; Argc_last = Argc; Argv_last = Argv; if (!Argc) return; optreset = optind = 1; while ((ch = getopt_long(Argc, Argv, options, longopts, NULL)) != -1) { switch (ch) { case 'b': if (backup_type == none) backup_type = numbered_existing; if (optarg == NULL) break; if (verbose) say("Warning, the ``-b suffix'' option has been" " obsoleted by the -z option.\n"); /* FALLTHROUGH */ case 'z': /* must directly follow 'b' case for backwards compat */ simple_backup_suffix = xstrdup(optarg); break; case 'B': origprae = xstrdup(optarg); break; case 'c': diff_type = CONTEXT_DIFF; break; case 'C': check_only = true; break; case 'd': if (chdir(optarg) < 0) pfatal("can't cd to %s", optarg); break; case 'D': do_defines = true; if (!isalpha((unsigned char)*optarg) && *optarg != '_') fatal("argument to -D is not an identifier\n"); snprintf(if_defined, sizeof if_defined, "#ifdef %s\n", optarg); snprintf(not_defined, sizeof not_defined, "#ifndef %s\n", optarg); snprintf(end_defined, sizeof end_defined, "#endif /* %s */\n", optarg); break; case 'e': diff_type = ED_DIFF; break; case 'E': remove_empty_files = true; break; case 'f': force = true; break; case 'F': maxfuzz = atoi(optarg); break; case 'i': if (++filec == MAXFILEC) fatal("too many file arguments\n"); filearg[filec] = xstrdup(optarg); break; case 'l': canonicalize = true; break; case 'n': diff_type = NORMAL_DIFF; break; case 'N': noreverse = true; break; case 'o': outname = xstrdup(optarg); break; case 'p': strippath = atoi(optarg); break; case 'r': if (strlcpy(rejname, optarg, sizeof(rejname)) >= sizeof(rejname)) fatal("argument for -r is too long\n"); break; case 'R': reverse = true; reverse_flag_specified = true; break; case 's': verbose = false; break; case 't': batch = true; break; case 'u': diff_type = UNI_DIFF; break; case 'v': version(); break; case 'V': backup_type = get_version(optarg); Vflag = true; break; #ifdef DEBUGGING case 'x': debug = atoi(optarg); break; #endif default: if (ch != '\0') usage(); break; } } Argc -= optind; Argv += optind; if (Argc > 0) { filearg[0] = xstrdup(*Argv++); Argc--; while (Argc > 0) { if (++filec == MAXFILEC) fatal("too many file arguments\n"); filearg[filec] = xstrdup(*Argv++); Argc--; } } if (getenv("POSIXLY_CORRECT") != NULL) posix = 1; } static void usage(void) { fprintf(stderr, "usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]\n" " [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]\n" " [-r rej-name] [-V t | nil | never | none] [-x number]\n" " [-z backup-ext] [--posix] [origfile [patchfile]]\n" " patch = first_guess) /* do not try lines < 0 */ max_neg_offset = first_guess - 1; if (first_guess <= input_lines && patch_match(first_guess, 0, fuzz)) return first_guess; for (offset = 1; ; offset++) { bool check_after = (offset <= max_pos_offset); bool check_before = (offset <= max_neg_offset); if (check_after && patch_match(first_guess, offset, fuzz)) { #ifdef DEBUGGING if (debug & 1) say("Offset changing from %ld to %ld\n", last_offset, offset); #endif last_offset = offset; return first_guess + offset; } else if (check_before && patch_match(first_guess, -offset, fuzz)) { #ifdef DEBUGGING if (debug & 1) say("Offset changing from %ld to %ld\n", last_offset, -offset); #endif last_offset = -offset; return first_guess - offset; } else if (!check_before && !check_after) return 0; } } /* We did not find the pattern, dump out the hunk so they can handle it. */ static void abort_context_hunk(void) { LINENUM i; const LINENUM pat_end = pch_end(); /* * add in last_offset to guess the same as the previous successful * hunk */ const LINENUM oldfirst = pch_first() + last_offset; const LINENUM newfirst = pch_newfirst() + last_offset; const LINENUM oldlast = oldfirst + pch_ptrn_lines() - 1; const LINENUM newlast = newfirst + pch_repl_lines() - 1; const char *stars = (diff_type >= NEW_CONTEXT_DIFF ? " ****" : ""); const char *minuses = (diff_type >= NEW_CONTEXT_DIFF ? " ----" : " -----"); fprintf(rejfp, "***************\n"); for (i = 0; i <= pat_end; i++) { switch (pch_char(i)) { case '*': if (oldlast < oldfirst) fprintf(rejfp, "*** 0%s\n", stars); else if (oldlast == oldfirst) fprintf(rejfp, "*** %ld%s\n", oldfirst, stars); else fprintf(rejfp, "*** %ld,%ld%s\n", oldfirst, oldlast, stars); break; case '=': if (newlast < newfirst) fprintf(rejfp, "--- 0%s\n", minuses); else if (newlast == newfirst) fprintf(rejfp, "--- %ld%s\n", newfirst, minuses); else fprintf(rejfp, "--- %ld,%ld%s\n", newfirst, newlast, minuses); break; case '\n': fprintf(rejfp, "%s", pfetch(i)); break; case ' ': case '-': case '+': case '!': fprintf(rejfp, "%c %s", pch_char(i), pfetch(i)); break; default: fatal("fatal internal error in abort_context_hunk\n"); } } } static void rej_line(int ch, LINENUM i) { size_t len; const char *line = pfetch(i); len = strlen(line); fprintf(rejfp, "%c%s", ch, line); if (len == 0 || line[len - 1] != '\n') { if (len >= USHRT_MAX) fprintf(rejfp, "\n\\ Line too long\n"); else fprintf(rejfp, "\n\\ No newline at end of line\n"); } } static void abort_hunk(void) { LINENUM i, j, split; int ch1, ch2; const LINENUM pat_end = pch_end(); const LINENUM oldfirst = pch_first() + last_offset; const LINENUM newfirst = pch_newfirst() + last_offset; if (diff_type != UNI_DIFF) { abort_context_hunk(); return; } split = -1; for (i = 0; i <= pat_end; i++) { if (pch_char(i) == '=') { split = i; break; } } if (split == -1) { fprintf(rejfp, "malformed hunk: no split found\n"); return; } i = 0; j = split + 1; fprintf(rejfp, "@@ -%ld,%ld +%ld,%ld @@\n", pch_ptrn_lines() ? oldfirst : 0, pch_ptrn_lines(), newfirst, pch_repl_lines()); while (i < split || j <= pat_end) { ch1 = i < split ? pch_char(i) : -1; ch2 = j <= pat_end ? pch_char(j) : -1; if (ch1 == '-') { rej_line('-', i); i++; } else if (ch1 == ' ' && ch2 == ' ') { rej_line(' ', i); i++; j++; } else if (ch1 == '!' && ch2 == '!') { while (i < split && ch1 == '!') { rej_line('-', i); i++; ch1 = i < split ? pch_char(i) : -1; } while (j <= pat_end && ch2 == '!') { rej_line('+', j); j++; ch2 = j <= pat_end ? pch_char(j) : -1; } } else if (ch1 == '*') { i++; } else if (ch2 == '+' || ch2 == ' ') { rej_line(ch2, j); j++; } else { fprintf(rejfp, "internal error on (%ld %ld %ld)\n", i, split, j); rej_line(ch1, i); rej_line(ch2, j); return; } } } /* We found where to apply it (we hope), so do it. */ static void apply_hunk(LINENUM where) { LINENUM old = 1; const LINENUM lastline = pch_ptrn_lines(); LINENUM new = lastline + 1; #define OUTSIDE 0 #define IN_IFNDEF 1 #define IN_IFDEF 2 #define IN_ELSE 3 int def_state = OUTSIDE; const LINENUM pat_end = pch_end(); where--; while (pch_char(new) == '=' || pch_char(new) == '\n') new++; while (old <= lastline) { if (pch_char(old) == '-') { copy_till(where + old - 1, false); if (do_defines) { if (def_state == OUTSIDE) { fputs(not_defined, ofp); def_state = IN_IFNDEF; } else if (def_state == IN_IFDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } fputs(pfetch(old), ofp); } last_frozen_line++; old++; } else if (new > pat_end) { break; } else if (pch_char(new) == '+') { copy_till(where + old - 1, false); if (do_defines) { if (def_state == IN_IFNDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } else if (def_state == OUTSIDE) { fputs(if_defined, ofp); def_state = IN_IFDEF; } } fputs(pfetch(new), ofp); new++; } else if (pch_char(new) != pch_char(old)) { say("Out-of-sync patch, lines %ld,%ld--mangled text or line numbers, maybe?\n", pch_hunk_beg() + old, pch_hunk_beg() + new); #ifdef DEBUGGING say("oldchar = '%c', newchar = '%c'\n", pch_char(old), pch_char(new)); #endif my_exit(2); } else if (pch_char(new) == '!') { copy_till(where + old - 1, false); if (do_defines) { fputs(not_defined, ofp); def_state = IN_IFNDEF; } while (pch_char(old) == '!') { if (do_defines) { fputs(pfetch(old), ofp); } last_frozen_line++; old++; } if (do_defines) { fputs(else_defined, ofp); def_state = IN_ELSE; } while (pch_char(new) == '!') { fputs(pfetch(new), ofp); new++; } } else { if (pch_char(new) != ' ') fatal("Internal error: expected ' '\n"); old++; new++; if (do_defines && def_state != OUTSIDE) { fputs(end_defined, ofp); def_state = OUTSIDE; } } } if (new <= pat_end && pch_char(new) == '+') { copy_till(where + old - 1, false); if (do_defines) { if (def_state == OUTSIDE) { fputs(if_defined, ofp); def_state = IN_IFDEF; } else if (def_state == IN_IFNDEF) { fputs(else_defined, ofp); def_state = IN_ELSE; } } while (new <= pat_end && pch_char(new) == '+') { fputs(pfetch(new), ofp); new++; } } if (do_defines && def_state != OUTSIDE) { fputs(end_defined, ofp); } } /* * Open the new file. */ static void init_output(const char *name) { ofp = fopen(name, "w"); if (ofp == NULL) pfatal("can't create %s", name); } /* * Open a file to put hunks we can't locate. */ static void init_reject(const char *name) { rejfp = fopen(name, "w"); if (rejfp == NULL) pfatal("can't create %s", name); } /* * Copy input file to output, up to wherever hunk is to be applied. * If endoffile is true, treat the last line specially since it may * lack a newline. */ static void copy_till(LINENUM lastline, bool endoffile) { if (last_frozen_line > lastline) fatal("misordered hunks! output would be garbled\n"); while (last_frozen_line < lastline) { if (++last_frozen_line == lastline && endoffile) dump_line(last_frozen_line, !last_line_missing_eol); else dump_line(last_frozen_line, true); } } /* * Finish copying the input file to the output file. */ static bool spew_output(void) { int rv; #ifdef DEBUGGING if (debug & 256) say("il=%ld lfl=%ld\n", input_lines, last_frozen_line); #endif if (input_lines) copy_till(input_lines, true); /* dump remainder of file */ rv = ferror(ofp) == 0 && fclose(ofp) == 0; ofp = NULL; return rv; } /* * Copy one line from input to output. */ static void dump_line(LINENUM line, bool write_newline) { char *s; s = ifetch(line, 0); if (s == NULL) return; /* Note: string is not NUL terminated. */ for (; *s != '\n'; s++) putc(*s, ofp); if (write_newline) putc('\n', ofp); } /* * Does the patch pattern match at line base+offset? */ static bool patch_match(LINENUM base, LINENUM offset, LINENUM fuzz) { LINENUM pline = 1 + fuzz; LINENUM iline; LINENUM pat_lines = pch_ptrn_lines() - fuzz; const char *ilineptr; const char *plineptr; unsigned short plinelen; /* Patch does not match if we don't have any more context to use */ if (pline > pat_lines) return false; for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) { ilineptr = ifetch(iline, offset >= 0); if (ilineptr == NULL) return false; plineptr = pfetch(pline); plinelen = pch_line_len(pline); if (canonicalize) { if (!similar(ilineptr, plineptr, plinelen)) return false; } else if (strnNE(ilineptr, plineptr, plinelen)) return false; if (iline == input_lines) { /* * We are looking at the last line of the file. * If the file has no eol, the patch line should * not have one either and vice-versa. Note that * plinelen > 0. */ if (last_line_missing_eol) { if (plineptr[plinelen - 1] == '\n') return false; } else { if (plineptr[plinelen - 1] != '\n') return false; } } } return true; } /* * Do two lines match with canonicalized white space? */ static bool similar(const char *a, const char *b, int len) { while (len) { if (isspace((unsigned char)*b)) { /* whitespace (or \n) to match? */ if (!isspace((unsigned char)*a)) /* no corresponding whitespace? */ return false; while (len && isspace((unsigned char)*b) && *b != '\n') b++, len--; /* skip pattern whitespace */ while (isspace((unsigned char)*a) && *a != '\n') a++; /* skip target whitespace */ if (*a == '\n' || *b == '\n') return (*a == *b); /* should end in sync */ } else if (*a++ != *b++) /* match non-whitespace chars */ return false; else len--; /* probably not necessary */ } return true; /* actually, this is not reached */ /* since there is always a \n */ } Index: stable/12/usr.bin/patch/pch.c =================================================================== --- stable/12/usr.bin/patch/pch.c (revision 345877) +++ stable/12/usr.bin/patch/pch.c (revision 345878) @@ -1,1636 +1,1639 @@ /*- * Copyright 1986, Larry Wall * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * patch - a program to apply diffs to original files * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour * * $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $ * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include #include #include "common.h" #include "util.h" #include "pch.h" #include "pathnames.h" /* Patch (diff listing) abstract type. */ static off_t p_filesize; /* size of the patch file */ static LINENUM p_first; /* 1st line number */ static LINENUM p_newfirst; /* 1st line number of replacement */ static LINENUM p_ptrn_lines; /* # lines in pattern */ static LINENUM p_repl_lines; /* # lines in replacement text */ static LINENUM p_end = -1; /* last line in hunk */ static LINENUM p_max; /* max allowed value of p_end */ static LINENUM p_context = 3; /* # of context lines */ static LINENUM p_input_line = 0; /* current line # from patch file */ static char **p_line = NULL;/* the text of the hunk */ static unsigned short *p_len = NULL; /* length of each line */ static char *p_char = NULL; /* +, -, and ! */ static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */ static int p_indent; /* indent to patch */ static off_t p_base; /* where to intuit this time */ static LINENUM p_bline; /* line # of p_base */ static off_t p_start; /* where intuit found a patch */ static LINENUM p_sline; /* and the line number for it */ static LINENUM p_hunk_beg; /* line number of current hunk */ static LINENUM p_efake = -1; /* end of faked up lines--don't free */ static LINENUM p_bfake = -1; /* beg of faked up lines */ static FILE *pfp = NULL; /* patch file pointer */ static char *bestguess = NULL; /* guess at correct filename */ static void grow_hunkmax(void); static int intuit_diff_type(void); static void next_intuit_at(off_t, LINENUM); static void skip_to(off_t, LINENUM); static size_t pgets(bool _do_indent); static char *best_name(const struct file_name *, bool); static char *posix_name(const struct file_name *, bool); static size_t num_components(const char *); static LINENUM strtolinenum(char *, char **); /* * Prepare to look for the next patch in the patch file. */ void re_patch(void) { p_first = 0; p_newfirst = 0; p_ptrn_lines = 0; p_repl_lines = 0; p_end = (LINENUM) - 1; p_max = 0; p_indent = 0; } /* * Open the patch file at the beginning of time. */ void open_patch_file(const char *filename) { struct stat filestat; int nr, nw; if (filename == NULL || *filename == '\0' || strEQ(filename, "-")) { pfp = fopen(TMPPATNAME, "w"); if (pfp == NULL) pfatal("can't create %s", TMPPATNAME); while ((nr = fread(buf, 1, buf_size, stdin)) > 0) { nw = fwrite(buf, 1, nr, pfp); if (nr != nw) pfatal("write error to %s", TMPPATNAME); } if (ferror(pfp) || fclose(pfp)) pfatal("can't write %s", TMPPATNAME); filename = TMPPATNAME; } pfp = fopen(filename, "r"); if (pfp == NULL) pfatal("patch file %s not found", filename); if (fstat(fileno(pfp), &filestat)) pfatal("can't stat %s", filename); p_filesize = filestat.st_size; next_intuit_at(0, 1L); /* start at the beginning */ set_hunkmax(); } /* * Make sure our dynamically realloced tables are malloced to begin with. */ void set_hunkmax(void) { if (p_line == NULL) p_line = malloc(hunkmax * sizeof(char *)); if (p_len == NULL) p_len = malloc(hunkmax * sizeof(unsigned short)); if (p_char == NULL) p_char = malloc(hunkmax * sizeof(char)); } /* * Enlarge the arrays containing the current hunk of patch. */ static void grow_hunkmax(void) { int new_hunkmax = hunkmax * 2; if (p_line == NULL || p_len == NULL || p_char == NULL) fatal("Internal memory allocation error\n"); p_line = reallocf(p_line, new_hunkmax * sizeof(char *)); p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short)); p_char = reallocf(p_char, new_hunkmax * sizeof(char)); if (p_line != NULL && p_len != NULL && p_char != NULL) { hunkmax = new_hunkmax; return; } if (!using_plan_a) fatal("out of memory\n"); out_of_mem = true; /* whatever is null will be allocated again */ /* from within plan_a(), of all places */ } /* True if the remainder of the patch file contains a diff of some sort. */ bool there_is_another_patch(void) { bool exists = false; if (p_base != 0 && p_base >= p_filesize) { if (verbose) say("done\n"); return false; } + if (p_filesize == 0) + return false; + nonempty_patchf_seen = true; if (verbose) say("Hmm..."); diff_type = intuit_diff_type(); if (!diff_type) { if (p_base != 0) { if (verbose) say(" Ignoring the trailing garbage.\ndone\n"); } else say(" I can't seem to find a patch in there anywhere.\n"); return false; } if (verbose) say(" %sooks like %s to me...\n", (p_base == 0 ? "L" : "The next patch l"), diff_type == UNI_DIFF ? "a unified diff" : diff_type == CONTEXT_DIFF ? "a context diff" : diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" : diff_type == NORMAL_DIFF ? "a normal diff" : "an ed script"); if (p_indent && verbose) say("(Patch is indented %d space%s.)\n", p_indent, p_indent == 1 ? "" : "s"); skip_to(p_start, p_sline); while (filearg[0] == NULL) { if (force || batch) { say("No file to patch. Skipping...\n"); filearg[0] = xstrdup(bestguess); skip_rest_of_patch = true; return true; } ask("File to patch: "); if (*buf != '\n') { free(bestguess); bestguess = xstrdup(buf); filearg[0] = fetchname(buf, &exists, 0); } if (!exists) { int def_skip = *bestguess == '\0'; ask("No file found--skip this patch? [%c] ", def_skip ? 'y' : 'n'); if (*buf == 'n' || (!def_skip && *buf != 'y')) continue; if (verbose) say("Skipping patch...\n"); free(filearg[0]); filearg[0] = fetchname(bestguess, &exists, 0); skip_rest_of_patch = true; return true; } } return true; } static void p4_fetchname(struct file_name *name, char *str) { char *t, *h; /* Skip leading whitespace. */ while (isspace((unsigned char)*str)) str++; /* Remove the file revision number. */ for (t = str, h = NULL; *t != '\0' && !isspace((unsigned char)*t); t++) if (*t == '#') h = t; if (h != NULL) *h = '\0'; name->path = fetchname(str, &name->exists, strippath); } /* Determine what kind of diff is in the remaining part of the patch file. */ static int intuit_diff_type(void) { off_t this_line = 0, previous_line; off_t first_command_line = -1; LINENUM fcl_line = -1; bool last_line_was_command = false, this_is_a_command = false; bool stars_last_line = false, stars_this_line = false; char *s, *t; int indent, retval; struct file_name names[MAX_FILE]; int piece_of_git = 0; memset(names, 0, sizeof(names)); ok_to_create_file = false; fseeko(pfp, p_base, SEEK_SET); p_input_line = p_bline - 1; for (;;) { previous_line = this_line; last_line_was_command = this_is_a_command; stars_last_line = stars_this_line; this_line = ftello(pfp); indent = 0; p_input_line++; if (pgets(false) == 0) { if (first_command_line >= 0) { /* nothing but deletes!? */ p_start = first_command_line; p_sline = fcl_line; retval = ED_DIFF; goto scan_exit; } else { p_start = this_line; p_sline = p_input_line; retval = 0; goto scan_exit; } } for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) { if (*s == '\t') indent += 8 - (indent % 8); else indent++; } for (t = s; isdigit((unsigned char)*t) || *t == ','; t++) ; this_is_a_command = (isdigit((unsigned char)*s) && (*t == 'd' || *t == 'c' || *t == 'a')); if (first_command_line < 0 && this_is_a_command) { first_command_line = this_line; fcl_line = p_input_line; p_indent = indent; /* assume this for now */ } if (!stars_last_line && strnEQ(s, "*** ", 4)) names[OLD_FILE].path = fetchname(s + 4, &names[OLD_FILE].exists, strippath); else if (strnEQ(s, "--- ", 4)) { size_t off = 4; if (piece_of_git && strippath == 957 && strnEQ(s, "--- a/", 6)) off = 6; names[NEW_FILE].path = fetchname(s + off, &names[NEW_FILE].exists, strippath); } else if (strnEQ(s, "+++ ", 4)) { /* pretend it is the old name */ size_t off = 4; if (piece_of_git && strippath == 957 && strnEQ(s, "+++ b/", 6)) off = 6; names[OLD_FILE].path = fetchname(s + off, &names[OLD_FILE].exists, strippath); } else if (strnEQ(s, "Index:", 6)) names[INDEX_FILE].path = fetchname(s + 6, &names[INDEX_FILE].exists, strippath); else if (strnEQ(s, "Prereq:", 7)) { for (t = s + 7; isspace((unsigned char)*t); t++) ; revision = xstrdup(t); for (t = revision; *t && !isspace((unsigned char)*t); t++) ; *t = '\0'; if (*revision == '\0') { free(revision); revision = NULL; } } else if (strnEQ(s, "diff --git a/", 13)) { /* Git-style diffs. */ piece_of_git = 1; } else if (strnEQ(s, "==== ", 5)) { /* Perforce-style diffs. */ if ((t = strstr(s + 5, " - ")) != NULL) p4_fetchname(&names[NEW_FILE], t + 3); p4_fetchname(&names[OLD_FILE], s + 5); } if ((!diff_type || diff_type == ED_DIFF) && first_command_line >= 0 && strEQ(s, ".\n")) { p_indent = indent; p_start = first_command_line; p_sline = fcl_line; retval = ED_DIFF; goto scan_exit; } if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) { if (strnEQ(s + 4, "0,0", 3)) ok_to_create_file = true; p_indent = indent; p_start = this_line; p_sline = p_input_line; retval = UNI_DIFF; goto scan_exit; } stars_this_line = strnEQ(s, "********", 8); if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line && strnEQ(s, "*** ", 4)) { if (strtolinenum(s + 4, &s) == 0) ok_to_create_file = true; /* * If this is a new context diff the character just * at the end of the line is a '*'. */ while (*s && *s != '\n') s++; p_indent = indent; p_start = previous_line; p_sline = p_input_line - 1; retval = (*(s - 1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF); goto scan_exit; } if ((!diff_type || diff_type == NORMAL_DIFF) && last_line_was_command && (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2))) { p_start = previous_line; p_sline = p_input_line - 1; p_indent = indent; retval = NORMAL_DIFF; goto scan_exit; } } scan_exit: if (retval == UNI_DIFF) { /* unswap old and new */ struct file_name tmp = names[OLD_FILE]; names[OLD_FILE] = names[NEW_FILE]; names[NEW_FILE] = tmp; } if (filearg[0] == NULL) { if (posix) filearg[0] = posix_name(names, ok_to_create_file); else { /* Ignore the Index: name for context diffs, like GNU */ if (names[OLD_FILE].path != NULL || names[NEW_FILE].path != NULL) { free(names[INDEX_FILE].path); names[INDEX_FILE].path = NULL; } filearg[0] = best_name(names, ok_to_create_file); } } free(bestguess); bestguess = NULL; if (filearg[0] != NULL) bestguess = xstrdup(filearg[0]); else if (!ok_to_create_file) { /* * We don't want to create a new file but we need a * filename to set bestguess. Avoid setting filearg[0] * so the file is not created automatically. */ if (posix) bestguess = posix_name(names, true); else bestguess = best_name(names, true); } free(names[OLD_FILE].path); free(names[NEW_FILE].path); free(names[INDEX_FILE].path); return retval; } /* * Remember where this patch ends so we know where to start up again. */ static void next_intuit_at(off_t file_pos, LINENUM file_line) { p_base = file_pos; p_bline = file_line; } /* * Basically a verbose fseeko() to the actual diff listing. */ static void skip_to(off_t file_pos, LINENUM file_line) { size_t len; if (p_base > file_pos) fatal("Internal error: seek %lld>%lld\n", (long long)p_base, (long long)file_pos); if (verbose && p_base < file_pos) { fseeko(pfp, p_base, SEEK_SET); say("The text leading up to this was:\n--------------------------\n"); while (ftello(pfp) < file_pos) { len = pgets(false); if (len == 0) fatal("Unexpected end of file\n"); say("|%s", buf); } say("--------------------------\n"); } else fseeko(pfp, file_pos, SEEK_SET); p_input_line = file_line - 1; } /* Make this a function for better debugging. */ static void malformed(void) { fatal("malformed patch at line %ld: %s", p_input_line, buf); /* about as informative as "Syntax error" in C */ } /* * True if the line has been discarded (i.e. it is a line saying * "\ No newline at end of file".) */ static bool remove_special_line(void) { int c; c = fgetc(pfp); if (c == '\\') { do { c = fgetc(pfp); } while (c != EOF && c != '\n'); return true; } if (c != EOF) fseeko(pfp, -1, SEEK_CUR); return false; } /* * True if there is more of the current diff listing to process. */ bool another_hunk(void) { off_t line_beginning; /* file pos of the current line */ LINENUM repl_beginning; /* index of --- line */ LINENUM fillcnt; /* #lines of missing ptrn or repl */ LINENUM fillsrc; /* index of first line to copy */ LINENUM filldst; /* index of first missing line */ bool ptrn_spaces_eaten; /* ptrn was slightly malformed */ bool repl_could_be_missing; /* no + or ! lines in this hunk */ bool repl_missing; /* we are now backtracking */ off_t repl_backtrack_position; /* file pos of first repl line */ LINENUM repl_patch_line; /* input line number for same */ LINENUM ptrn_copiable; /* # of copiable lines in ptrn */ char *s; size_t len; int context = 0; while (p_end >= 0) { if (p_end == p_efake) p_end = p_bfake; /* don't free twice */ else free(p_line[p_end]); p_end--; } p_efake = -1; p_max = hunkmax; /* gets reduced when --- found */ if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) { line_beginning = ftello(pfp); repl_beginning = 0; fillcnt = 0; fillsrc = 0; filldst = 0; ptrn_spaces_eaten = false; repl_could_be_missing = true; repl_missing = false; repl_backtrack_position = 0; repl_patch_line = 0; ptrn_copiable = 0; len = pgets(true); p_input_line++; if (len == 0 || strnNE(buf, "********", 8)) { next_intuit_at(line_beginning, p_input_line); return false; } p_context = 100; p_hunk_beg = p_input_line + 1; while (p_end < p_max) { line_beginning = ftello(pfp); len = pgets(true); p_input_line++; if (len == 0) { if (p_max - p_end < 4) { /* assume blank lines got chopped */ strlcpy(buf, " \n", buf_size); } else { if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } fatal("unexpected end of file in patch\n"); } } p_end++; if (p_end >= hunkmax) fatal("Internal error: hunk larger than hunk " "buffer size"); p_char[p_end] = *buf; p_line[p_end] = NULL; switch (*buf) { case '*': if (strnEQ(buf, "********", 8)) { if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } else fatal("unexpected end of hunk " "at line %ld\n", p_input_line); } if (p_end != 0) { if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } fatal("unexpected *** at line %ld: %s", p_input_line, buf); } context = 0; p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return false; } for (s = buf; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); if (strnEQ(s, "0,0", 3)) memmove(s, s + 2, strlen(s + 2) + 1); p_first = strtolinenum(s, &s); if (*s == ',') { for (; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); p_ptrn_lines = strtolinenum(s, &s) - p_first + 1; if (p_ptrn_lines < 0) malformed(); } else if (p_first) p_ptrn_lines = 1; else { p_ptrn_lines = 0; p_first = 1; } if (p_first >= LINENUM_MAX - p_ptrn_lines || p_ptrn_lines >= LINENUM_MAX - 6) malformed(); /* we need this much at least */ p_max = p_ptrn_lines + 6; while (p_max >= hunkmax) grow_hunkmax(); p_max = hunkmax; break; case '-': if (buf[1] == '-') { if (repl_beginning || (p_end != p_ptrn_lines + 1 + (p_char[p_end - 1] == '\n'))) { if (p_end == 1) { /* * `old' lines were omitted; * set up to fill them in * from 'new' context lines. */ p_end = p_ptrn_lines + 1; fillsrc = p_end + 1; filldst = 1; fillcnt = p_ptrn_lines; } else { if (repl_beginning) { if (repl_could_be_missing) { repl_missing = true; goto hunk_done; } fatal("duplicate \"---\" at line %ld--check line numbers at line %ld\n", p_input_line, p_hunk_beg + repl_beginning); } else { fatal("%s \"---\" at line %ld--check line numbers at line %ld\n", (p_end <= p_ptrn_lines ? "Premature" : "Overdue"), p_input_line, p_hunk_beg); } } } repl_beginning = p_end; repl_backtrack_position = ftello(pfp); repl_patch_line = p_input_line; p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return false; } p_char[p_end] = '='; for (s = buf; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); p_newfirst = strtolinenum(s, &s); if (*s == ',') { for (; *s && !isdigit((unsigned char)*s); s++) ; if (!*s) malformed(); p_repl_lines = strtolinenum(s, &s) - p_newfirst + 1; if (p_repl_lines < 0) malformed(); } else if (p_newfirst) p_repl_lines = 1; else { p_repl_lines = 0; p_newfirst = 1; } if (p_newfirst >= LINENUM_MAX - p_repl_lines || p_repl_lines >= LINENUM_MAX - p_end) malformed(); p_max = p_repl_lines + p_end; if (p_max > MAXHUNKSIZE) fatal("hunk too large (%ld lines) at line %ld: %s", p_max, p_input_line, buf); while (p_max >= hunkmax) grow_hunkmax(); if (p_repl_lines != ptrn_copiable && (p_context != 0 || p_repl_lines != 1)) repl_could_be_missing = false; break; } goto change_line; case '+': case '!': repl_could_be_missing = false; change_line: if (buf[1] == '\n' && canonicalize) strlcpy(buf + 1, " \n", buf_size - 1); if (!isspace((unsigned char)buf[1]) && buf[1] != '>' && buf[1] != '<' && repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } if (context >= 0) { if (context < p_context) p_context = context; context = -1000; } p_line[p_end] = savestr(buf + 2); if (out_of_mem) { p_end--; return false; } if (p_end == p_ptrn_lines) { if (remove_special_line()) { int l; l = strlen(p_line[p_end]) - 1; (p_line[p_end])[l] = 0; } } break; case '\t': case '\n': /* assume the 2 spaces got eaten */ if (repl_beginning && repl_could_be_missing && (!ptrn_spaces_eaten || diff_type == NEW_CONTEXT_DIFF)) { repl_missing = true; goto hunk_done; } p_line[p_end] = savestr(buf); if (out_of_mem) { p_end--; return false; } if (p_end != p_ptrn_lines + 1) { ptrn_spaces_eaten |= (repl_beginning != 0); context++; if (!repl_beginning) ptrn_copiable++; p_char[p_end] = ' '; } break; case ' ': if (!isspace((unsigned char)buf[1]) && repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } context++; if (!repl_beginning) ptrn_copiable++; p_line[p_end] = savestr(buf + 2); if (out_of_mem) { p_end--; return false; } break; default: if (repl_beginning && repl_could_be_missing) { repl_missing = true; goto hunk_done; } malformed(); } /* set up p_len for strncmp() so we don't have to */ /* assume null termination */ if (p_line[p_end]) p_len[p_end] = strlen(p_line[p_end]); else p_len[p_end] = 0; } hunk_done: if (p_end >= 0 && !repl_beginning) fatal("no --- found in patch at line %ld\n", pch_hunk_beg()); if (repl_missing) { /* reset state back to just after --- */ p_input_line = repl_patch_line; for (p_end--; p_end > repl_beginning; p_end--) free(p_line[p_end]); fseeko(pfp, repl_backtrack_position, SEEK_SET); /* redundant 'new' context lines were omitted - set */ /* up to fill them in from the old file context */ if (!p_context && p_repl_lines == 1) { p_repl_lines = 0; p_max--; } fillsrc = 1; filldst = repl_beginning + 1; fillcnt = p_repl_lines; p_end = p_max; } else if (!p_context && fillcnt == 1) { /* the first hunk was a null hunk with no context */ /* and we were expecting one line -- fix it up. */ while (filldst < p_end) { p_line[filldst] = p_line[filldst + 1]; p_char[filldst] = p_char[filldst + 1]; p_len[filldst] = p_len[filldst + 1]; filldst++; } #if 0 repl_beginning--; /* this doesn't need to be fixed */ #endif p_end--; p_first++; /* do append rather than insert */ fillcnt = 0; p_ptrn_lines = 0; } if (diff_type == CONTEXT_DIFF && (fillcnt || (p_first > 1 && ptrn_copiable > 2 * p_context))) { if (verbose) say("%s\n%s\n%s\n", "(Fascinating--this is really a new-style context diff but without", "the telltale extra asterisks on the *** line that usually indicate", "the new style...)"); diff_type = NEW_CONTEXT_DIFF; } /* if there were omitted context lines, fill them in now */ if (fillcnt) { p_bfake = filldst; /* remember where not to free() */ p_efake = filldst + fillcnt - 1; while (fillcnt-- > 0) { while (fillsrc <= p_end && p_char[fillsrc] != ' ') fillsrc++; if (fillsrc > p_end) fatal("replacement text or line numbers mangled in hunk at line %ld\n", p_hunk_beg); p_line[filldst] = p_line[fillsrc]; p_char[filldst] = p_char[fillsrc]; p_len[filldst] = p_len[fillsrc]; fillsrc++; filldst++; } while (fillsrc <= p_end && fillsrc != repl_beginning && p_char[fillsrc] != ' ') fillsrc++; #ifdef DEBUGGING if (debug & 64) printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n", fillsrc, filldst, repl_beginning, p_end + 1); #endif if (fillsrc != p_end + 1 && fillsrc != repl_beginning) malformed(); if (filldst != p_end + 1 && filldst != repl_beginning) malformed(); } if (p_line[p_end] != NULL) { if (remove_special_line()) { p_len[p_end] -= 1; (p_line[p_end])[p_len[p_end]] = 0; } } } else if (diff_type == UNI_DIFF) { LINENUM fillold; /* index of old lines */ LINENUM fillnew; /* index of new lines */ char ch; line_beginning = ftello(pfp); /* file pos of the current line */ len = pgets(true); p_input_line++; if (len == 0 || strnNE(buf, "@@ -", 4)) { next_intuit_at(line_beginning, p_input_line); return false; } s = buf + 4; if (!*s) malformed(); p_first = strtolinenum(s, &s); if (*s == ',') { p_ptrn_lines = strtolinenum(s + 1, &s); } else p_ptrn_lines = 1; if (*s == ' ') s++; if (*s != '+' || !*++s) malformed(); p_newfirst = strtolinenum(s, &s); if (*s == ',') { p_repl_lines = strtolinenum(s + 1, &s); } else p_repl_lines = 1; if (*s == ' ') s++; if (*s != '@') malformed(); if (p_first >= LINENUM_MAX - p_ptrn_lines || p_newfirst > LINENUM_MAX - p_repl_lines || p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1) malformed(); if (!p_ptrn_lines) p_first++; /* do append rather than insert */ p_max = p_ptrn_lines + p_repl_lines + 1; while (p_max >= hunkmax) grow_hunkmax(); fillold = 1; fillnew = fillold + p_ptrn_lines; p_end = fillnew + p_repl_lines; snprintf(buf, buf_size, "*** %ld,%ld ****\n", p_first, p_first + p_ptrn_lines - 1); p_line[0] = savestr(buf); if (out_of_mem) { p_end = -1; return false; } p_char[0] = '*'; snprintf(buf, buf_size, "--- %ld,%ld ----\n", p_newfirst, p_newfirst + p_repl_lines - 1); p_line[fillnew] = savestr(buf); if (out_of_mem) { p_end = 0; return false; } p_char[fillnew++] = '='; p_context = 100; context = 0; p_hunk_beg = p_input_line + 1; while (fillold <= p_ptrn_lines || fillnew <= p_end) { line_beginning = ftello(pfp); len = pgets(true); p_input_line++; if (len == 0) { if (p_max - fillnew < 3) { /* assume blank lines got chopped */ strlcpy(buf, " \n", buf_size); } else { fatal("unexpected end of file in patch\n"); } } if (*buf == '\t' || *buf == '\n') { ch = ' '; /* assume the space got eaten */ s = savestr(buf); } else { ch = *buf; s = savestr(buf + 1); } if (out_of_mem) { while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; return false; } switch (ch) { case '-': if (fillold > p_ptrn_lines) { free(s); p_end = fillnew - 1; malformed(); } p_char[fillold] = ch; p_line[fillold] = s; p_len[fillold++] = strlen(s); if (fillold > p_ptrn_lines) { if (remove_special_line()) { p_len[fillold - 1] -= 1; s[p_len[fillold - 1]] = 0; } } break; case '=': ch = ' '; /* FALL THROUGH */ case ' ': if (fillold > p_ptrn_lines) { free(s); while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; malformed(); } context++; p_char[fillold] = ch; p_line[fillold] = s; p_len[fillold++] = strlen(s); s = savestr(s); if (out_of_mem) { while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; return false; } if (fillold > p_ptrn_lines) { if (remove_special_line()) { p_len[fillold - 1] -= 1; s[p_len[fillold - 1]] = 0; } } /* FALL THROUGH */ case '+': if (fillnew > p_end) { free(s); while (--fillnew > p_ptrn_lines) free(p_line[fillnew]); p_end = fillold - 1; malformed(); } p_char[fillnew] = ch; p_line[fillnew] = s; p_len[fillnew++] = strlen(s); if (fillold > p_ptrn_lines) { if (remove_special_line()) { p_len[fillnew - 1] -= 1; s[p_len[fillnew - 1]] = 0; } } break; default: p_end = fillnew; malformed(); } if (ch != ' ' && context > 0) { if (context < p_context) p_context = context; context = -1000; } } /* while */ } else { /* normal diff--fake it up */ char hunk_type; int i; LINENUM min, max; line_beginning = ftello(pfp); p_context = 0; len = pgets(true); p_input_line++; if (len == 0 || !isdigit((unsigned char)*buf)) { next_intuit_at(line_beginning, p_input_line); return false; } p_first = strtolinenum(buf, &s); if (*s == ',') { p_ptrn_lines = strtolinenum(s + 1, &s) - p_first + 1; if (p_ptrn_lines < 0) malformed(); } else p_ptrn_lines = (*s != 'a'); hunk_type = *s; if (hunk_type == 'a') p_first++; /* do append rather than insert */ min = strtolinenum(s + 1, &s); if (*s == ',') max = strtolinenum(s + 1, &s); else max = min; if (min < 0 || min > max || max - min == LINENUM_MAX) malformed(); if (hunk_type == 'd') min++; p_newfirst = min; p_repl_lines = max - min + 1; if (p_newfirst > LINENUM_MAX - p_repl_lines || p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1) malformed(); p_end = p_ptrn_lines + p_repl_lines + 1; if (p_end > MAXHUNKSIZE) fatal("hunk too large (%ld lines) at line %ld: %s", p_end, p_input_line, buf); while (p_end >= hunkmax) grow_hunkmax(); snprintf(buf, buf_size, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1); p_line[0] = savestr(buf); if (out_of_mem) { p_end = -1; return false; } p_char[0] = '*'; for (i = 1; i <= p_ptrn_lines; i++) { len = pgets(true); p_input_line++; if (len == 0) fatal("unexpected end of file in patch at line %ld\n", p_input_line); if (*buf != '<') fatal("< expected at line %ld of patch\n", p_input_line); p_line[i] = savestr(buf + 2); if (out_of_mem) { p_end = i - 1; return false; } p_len[i] = strlen(p_line[i]); p_char[i] = '-'; } if (remove_special_line()) { p_len[i - 1] -= 1; (p_line[i - 1])[p_len[i - 1]] = 0; } if (hunk_type == 'c') { len = pgets(true); p_input_line++; if (len == 0) fatal("unexpected end of file in patch at line %ld\n", p_input_line); if (*buf != '-') fatal("--- expected at line %ld of patch\n", p_input_line); } snprintf(buf, buf_size, "--- %ld,%ld\n", min, max); p_line[i] = savestr(buf); if (out_of_mem) { p_end = i - 1; return false; } p_char[i] = '='; for (i++; i <= p_end; i++) { len = pgets(true); p_input_line++; if (len == 0) fatal("unexpected end of file in patch at line %ld\n", p_input_line); if (*buf != '>') fatal("> expected at line %ld of patch\n", p_input_line); /* Don't overrun if we don't have enough line */ if (len > 2) p_line[i] = savestr(buf + 2); else p_line[i] = savestr(""); if (out_of_mem) { p_end = i - 1; return false; } p_len[i] = strlen(p_line[i]); p_char[i] = '+'; } if (remove_special_line()) { p_len[i - 1] -= 1; (p_line[i - 1])[p_len[i - 1]] = 0; } } if (reverse) /* backwards patch? */ if (!pch_swap()) say("Not enough memory to swap next hunk!\n"); #ifdef DEBUGGING if (debug & 2) { LINENUM i; char special; for (i = 0; i <= p_end; i++) { if (i == p_ptrn_lines) special = '^'; else special = ' '; fprintf(stderr, "%3ld %c %c %s", i, p_char[i], special, p_line[i]); fflush(stderr); } } #endif if (p_end + 1 < hunkmax)/* paranoia reigns supreme... */ p_char[p_end + 1] = '^'; /* add a stopper for apply_hunk */ return true; } /* * Input a line from the patch file. * Worry about indentation if do_indent is true. * The line is read directly into the buf global variable which * is resized if necessary in order to hold the complete line. * Returns the number of characters read including the terminating * '\n', if any. */ size_t pgets(bool do_indent) { char *line; size_t len; int indent = 0, skipped = 0; line = fgetln(pfp, &len); if (line != NULL) { if (len + 1 > buf_size) { while (len + 1 > buf_size) buf_size *= 2; free(buf); buf = malloc(buf_size); if (buf == NULL) fatal("out of memory\n"); } if (do_indent == 1 && p_indent) { for (; indent < p_indent && (*line == ' ' || *line == '\t' || *line == 'X'); line++, skipped++) { if (*line == '\t') indent += 8 - (indent %7); else indent++; } } memcpy(buf, line, len - skipped); buf[len - skipped] = '\0'; } return len; } /* * Reverse the old and new portions of the current hunk. */ bool pch_swap(void) { char **tp_line; /* the text of the hunk */ unsigned short *tp_len;/* length of each line */ char *tp_char; /* +, -, and ! */ LINENUM i; LINENUM n; bool blankline = false; char *s; i = p_first; p_first = p_newfirst; p_newfirst = i; /* make a scratch copy */ tp_line = p_line; tp_len = p_len; tp_char = p_char; p_line = NULL; /* force set_hunkmax to allocate again */ p_len = NULL; p_char = NULL; set_hunkmax(); if (p_line == NULL || p_len == NULL || p_char == NULL) { free(p_line); p_line = tp_line; free(p_len); p_len = tp_len; free(p_char); p_char = tp_char; return false; /* not enough memory to swap hunk! */ } /* now turn the new into the old */ i = p_ptrn_lines + 1; if (tp_char[i] == '\n') { /* account for possible blank line */ blankline = true; i++; } if (p_efake >= 0) { /* fix non-freeable ptr range */ if (p_efake <= i) n = p_end - i + 1; else n = -i; p_efake += n; p_bfake += n; } for (n = 0; i <= p_end; i++, n++) { p_line[n] = tp_line[i]; p_char[n] = tp_char[i]; if (p_char[n] == '+') p_char[n] = '-'; p_len[n] = tp_len[i]; } if (blankline) { i = p_ptrn_lines + 1; p_line[n] = tp_line[i]; p_char[n] = tp_char[i]; p_len[n] = tp_len[i]; n++; } if (p_char[0] != '=') fatal("Malformed patch at line %ld: expected '=' found '%c'\n", p_input_line, p_char[0]); p_char[0] = '*'; for (s = p_line[0]; *s; s++) if (*s == '-') *s = '*'; /* now turn the old into the new */ if (p_char[0] != '*') fatal("Malformed patch at line %ld: expected '*' found '%c'\n", p_input_line, p_char[0]); tp_char[0] = '='; for (s = tp_line[0]; *s; s++) if (*s == '*') *s = '-'; for (i = 0; n <= p_end; i++, n++) { p_line[n] = tp_line[i]; p_char[n] = tp_char[i]; if (p_char[n] == '-') p_char[n] = '+'; p_len[n] = tp_len[i]; } if (i != p_ptrn_lines + 1) fatal("Malformed patch at line %ld: expected %ld lines, " "got %ld\n", p_input_line, p_ptrn_lines + 1, i); i = p_ptrn_lines; p_ptrn_lines = p_repl_lines; p_repl_lines = i; free(tp_line); free(tp_len); free(tp_char); return true; } /* * Return the specified line position in the old file of the old context. */ LINENUM pch_first(void) { return p_first; } /* * Return the number of lines of old context. */ LINENUM pch_ptrn_lines(void) { return p_ptrn_lines; } /* * Return the probable line position in the new file of the first line. */ LINENUM pch_newfirst(void) { return p_newfirst; } /* * Return the number of lines in the replacement text including context. */ LINENUM pch_repl_lines(void) { return p_repl_lines; } /* * Return the number of lines in the whole hunk. */ LINENUM pch_end(void) { return p_end; } /* * Return the number of context lines before the first changed line. */ LINENUM pch_context(void) { return p_context; } /* * Return the length of a particular patch line. */ unsigned short pch_line_len(LINENUM line) { return p_len[line]; } /* * Return the control character (+, -, *, !, etc) for a patch line. */ char pch_char(LINENUM line) { return p_char[line]; } /* * Return a pointer to a particular patch line. */ char * pfetch(LINENUM line) { return p_line[line]; } /* * Return where in the patch file this hunk began, for error messages. */ LINENUM pch_hunk_beg(void) { return p_hunk_beg; } /* * Apply an ed script by feeding ed itself. */ void do_ed_script(void) { char *t; off_t beginning_of_this_line; FILE *pipefp = NULL; int continuation; if (!skip_rest_of_patch) { if (copy_file(filearg[0], TMPOUTNAME) < 0) { unlink(TMPOUTNAME); fatal("can't create temp file %s", TMPOUTNAME); } snprintf(buf, buf_size, "%s%s%s", _PATH_RED, verbose ? " " : " -s ", TMPOUTNAME); pipefp = popen(buf, "w"); } for (;;) { beginning_of_this_line = ftello(pfp); if (pgets(true) == 0) { next_intuit_at(beginning_of_this_line, p_input_line); break; } p_input_line++; for (t = buf; isdigit((unsigned char)*t) || *t == ','; t++) ; /* POSIX defines allowed commands as {a,c,d,i,s} */ if (isdigit((unsigned char)*buf) && (*t == 'a' || *t == 'c' || *t == 'd' || *t == 'i' || *t == 's')) { if (pipefp != NULL) fputs(buf, pipefp); if (*t == 's') { for (;;) { continuation = 0; t = strchr(buf, '\0') - 1; while (--t >= buf && *t == '\\') continuation = !continuation; if (!continuation || pgets(true) == 0) break; if (pipefp != NULL) fputs(buf, pipefp); } } else if (*t != 'd') { while (pgets(true)) { p_input_line++; if (pipefp != NULL) fputs(buf, pipefp); if (strEQ(buf, ".\n")) break; } } } else { next_intuit_at(beginning_of_this_line, p_input_line); break; } } if (pipefp == NULL) return; fprintf(pipefp, "w\n"); fprintf(pipefp, "q\n"); fflush(pipefp); pclose(pipefp); ignore_signals(); if (!check_only) { if (move_file(TMPOUTNAME, outname) < 0) { toutkeep = true; chmod(TMPOUTNAME, filemode); } else chmod(outname, filemode); } set_signals(1); } /* * Choose the name of the file to be patched based on POSIX rules. * NOTE: the POSIX rules are amazingly stupid and we only follow them * if the user specified --posix or set POSIXLY_CORRECT. */ static char * posix_name(const struct file_name *names, bool assume_exists) { char *path = NULL; int i; /* * POSIX states that the filename will be chosen from one * of the old, new and index names (in that order) if * the file exists relative to CWD after -p stripping. */ for (i = 0; i < MAX_FILE; i++) { if (names[i].path != NULL && names[i].exists) { path = names[i].path; break; } } if (path == NULL && !assume_exists) { /* * No files found, check to see if the diff could be * creating a new file. */ if (path == NULL && ok_to_create_file && names[NEW_FILE].path != NULL) path = names[NEW_FILE].path; } return path ? xstrdup(path) : NULL; } static char * compare_names(const struct file_name *names, bool assume_exists) { size_t min_components, min_baselen, min_len, tmp; char *best = NULL; char *path; int i; /* * The "best" name is the one with the fewest number of path * components, the shortest basename length, and the shortest * overall length (in that order). We only use the Index: file * if neither of the old or new files could be intuited from * the diff header. */ min_components = min_baselen = min_len = SIZE_MAX; for (i = INDEX_FILE; i >= OLD_FILE; i--) { path = names[i].path; if (path == NULL || (!names[i].exists && !assume_exists)) continue; if ((tmp = num_components(path)) > min_components) continue; if (tmp < min_components) { min_components = tmp; best = path; } if ((tmp = strlen(basename(path))) > min_baselen) continue; if (tmp < min_baselen) { min_baselen = tmp; best = path; } if ((tmp = strlen(path)) > min_len) continue; min_len = tmp; best = path; } return best; } /* * Choose the name of the file to be patched based the "best" one * available. */ static char * best_name(const struct file_name *names, bool assume_exists) { char *best; best = compare_names(names, assume_exists); /* No match? Check to see if the diff could be creating a new file. */ if (best == NULL && ok_to_create_file) best = names[NEW_FILE].path; return best ? xstrdup(best) : NULL; } static size_t num_components(const char *path) { size_t n; const char *cp; for (n = 0, cp = path; (cp = strchr(cp, '/')) != NULL; n++, cp++) { while (*cp == '/') cp++; /* skip consecutive slashes */ } return n; } /* * Convert number at NPTR into LINENUM and save address of first * character that is not a digit in ENDPTR. If conversion is not * possible, call fatal. */ static LINENUM strtolinenum(char *nptr, char **endptr) { LINENUM rv; char c; char *p; const char *errstr; for (p = nptr; isdigit((unsigned char)*p); p++) ; if (p == nptr) malformed(); c = *p; *p = '\0'; rv = strtonum(nptr, 0, LINENUM_MAX, &errstr); if (errstr != NULL) fatal("invalid line number at line %ld: `%s' is %s\n", p_input_line, nptr, errstr); *p = c; *endptr = p; return rv; } Index: stable/12 =================================================================== --- stable/12 (revision 345877) +++ stable/12 (revision 345878) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r344677