Index: head/usr.bin/patch/backupfile.c =================================================================== --- head/usr.bin/patch/backupfile.c (revision 285771) +++ head/usr.bin/patch/backupfile.c (revision 285772) @@ -1,246 +1,246 @@ /*- * Copyright (C) 1990 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify it * without restriction. * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. * * backupfile.c -- make Emacs style backup file names * * David MacKenzie . Some algorithms adapted from GNU Emacs. * * $OpenBSD: backupfile.c,v 1.20 2009/10/27 23:59:41 deraadt Exp $ * $FreeBSD$ */ #include #include #include #include #include #include #include #include "backupfile.h" #define ISDIGIT(c) (isascii ((unsigned char)c) && isdigit ((unsigned char)c)) /* Which type of backup file names are generated. */ enum backup_type backup_type = none; /* * The extension added to file names to produce a simple (as opposed to * numbered) backup file name. */ const char *simple_backup_suffix = "~"; static char *concat(const char *, const char *); static char *make_version_name(const char *, int); static int max_backup_version(const char *, const char *); static int version_number(const char *, const char *, size_t); static int argmatch(const char *, const char **); static void invalid_arg(const char *, const char *, int); /* * Return the name of the new backup file for file FILE, allocated with * malloc. Return 0 if out of memory. FILE must not end with a '/' unless it * is the root directory. Do not call this function if backup_type == none. */ char * find_backup_file_name(const char *file) { char *dir, *base_versions, *tmp_file; int highest_backup; if (backup_type == simple) return concat(file, simple_backup_suffix); tmp_file = strdup(file); if (tmp_file == NULL) return NULL; base_versions = concat(basename(tmp_file), ".~"); free(tmp_file); if (base_versions == NULL) return NULL; tmp_file = strdup(file); if (tmp_file == NULL) { free(base_versions); return NULL; } dir = dirname(tmp_file); if (dir == NULL) { free(base_versions); free(tmp_file); return NULL; } highest_backup = max_backup_version(base_versions, dir); free(base_versions); free(tmp_file); if (backup_type == numbered_existing && highest_backup == 0) return concat(file, simple_backup_suffix); return make_version_name(file, highest_backup + 1); } /* * Return the number of the highest-numbered backup file for file FILE in * directory DIR. If there are no numbered backups of FILE in DIR, or an * error occurs reading DIR, return 0. FILE should already have ".~" appended * to it. */ static int max_backup_version(const char *file, const char *dir) { DIR *dirp; struct dirent *dp; int highest_version, this_version; size_t file_name_length; dirp = opendir(dir); if (dirp == NULL) return 0; highest_version = 0; file_name_length = strlen(file); while ((dp = readdir(dirp)) != NULL) { if (dp->d_namlen <= file_name_length) continue; this_version = version_number(file, dp->d_name, file_name_length); if (this_version > highest_version) highest_version = this_version; } closedir(dirp); return highest_version; } /* * Return a string, allocated with malloc, containing "FILE.~VERSION~". * Return 0 if out of memory. */ static char * make_version_name(const char *file, int version) { char *backup_name; if (asprintf(&backup_name, "%s.~%d~", file, version) == -1) return NULL; return backup_name; } /* * If BACKUP is a numbered backup of BASE, return its version number; * otherwise return 0. BASE_LENGTH is the length of BASE. BASE should * already have ".~" appended to it. */ static int version_number(const char *base, const char *backup, size_t base_length) { int version; const char *p; version = 0; if (!strncmp(base, backup, base_length) && ISDIGIT(backup[base_length])) { for (p = &backup[base_length]; ISDIGIT(*p); ++p) version = version * 10 + *p - '0'; if (p[0] != '~' || p[1]) version = 0; } return version; } /* * Return the newly-allocated concatenation of STR1 and STR2. If out of * memory, return 0. */ static char * concat(const char *str1, const char *str2) { char *newstr; if (asprintf(&newstr, "%s%s", str1, str2) == -1) return NULL; return newstr; } /* * If ARG is an unambiguous match for an element of the null-terminated array * OPTLIST, return the index in OPTLIST of the matched element, else -1 if it * does not match any element or -2 if it is ambiguous (is a prefix of more * than one element). */ static int argmatch(const char *arg, const char **optlist) { int i; /* Temporary index in OPTLIST. */ size_t arglen; /* Length of ARG. */ int matchind = -1; /* Index of first nonexact match. */ int ambiguous = 0; /* If nonzero, multiple nonexact match(es). */ arglen = strlen(arg); /* Test all elements for either exact match or abbreviated matches. */ for (i = 0; optlist[i]; i++) { if (!strncmp(optlist[i], arg, arglen)) { if (strlen(optlist[i]) == arglen) /* Exact match found. */ return i; else if (matchind == -1) /* First nonexact match found. */ matchind = i; else /* Second nonexact match found. */ ambiguous = 1; } } if (ambiguous) return -2; else return matchind; } /* * Error reporting for argmatch. KIND is a description of the type of entity * that was being matched. VALUE is the invalid value that was given. PROBLEM * is the return value from argmatch. */ static void invalid_arg(const char *kind, const char *value, int problem) { fprintf(stderr, "patch: "); if (problem == -1) fprintf(stderr, "invalid"); else /* Assume -2. */ fprintf(stderr, "ambiguous"); fprintf(stderr, " %s `%s'\n", kind, value); } static const char *backup_args[] = { - "never", "simple", "nil", "existing", "t", "numbered", 0 + "none", "never", "simple", "nil", "existing", "t", "numbered", 0 }; static enum backup_type backup_types[] = { - simple, simple, numbered_existing, + none, simple, simple, numbered_existing, numbered_existing, numbered, numbered }; /* * Return the type of backup indicated by VERSION. Unique abbreviations are * accepted. */ enum backup_type get_version(const char *version) { int i; if (version == NULL || *version == '\0') return numbered_existing; i = argmatch(version, backup_args); if (i >= 0) return backup_types[i]; invalid_arg("version control type", version, i); exit(2); } Index: head/usr.bin/patch/patch.1 =================================================================== --- head/usr.bin/patch/patch.1 (revision 285771) +++ head/usr.bin/patch/patch.1 (revision 285772) @@ -1,697 +1,699 @@ .\"- .\" 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. .\" .\" $OpenBSD: patch.1,v 1.27 2014/04/15 06:26:54 jmc Exp $ .\" $FreeBSD$ -.Dd June 15, 2014 +.Dd July 21, 2015 .Dt PATCH 1 .Os .Sh NAME .Nm patch .Nd apply a diff file to an original .Sh SYNOPSIS .Nm .Bk -words .Op Fl bCcEeflNnRstuv .Op Fl B Ar backup-prefix .Op Fl D Ar symbol .Op Fl d Ar directory .Op Fl F Ar max-fuzz .Op Fl i Ar patchfile .Op Fl o Ar out-file .Op Fl p Ar strip-count .Op Fl r Ar rej-name -.Op Fl V Cm t | nil | never +.Op Fl V Cm t | nil | never | none .Op Fl x Ar number .Op Fl z Ar backup-ext .Op Fl Fl posix .Op Ar origfile Op Ar patchfile .Ek .Nm .Pf \*(Lt Ar patchfile .Sh DESCRIPTION .Nm will take a patch file containing any of the four forms of difference listing produced by the .Xr diff 1 program and apply those differences to an original file, producing a patched version. If .Ar patchfile is omitted, or is a hyphen, the patch will be read from the standard input. .Pp .Nm will attempt to determine the type of the diff listing, unless overruled by a .Fl c , .Fl e , .Fl n , or .Fl u option. Context diffs (old-style, new-style, and unified) and normal diffs are applied directly by the .Nm program itself, whereas ed diffs are simply fed to the .Xr ed 1 editor via a pipe. .Pp If the .Ar patchfile contains more than one patch, .Nm will try to apply each of them as if they came from separate patch files. This means, among other things, that it is assumed that the name of the file to patch must be determined for each diff listing, and that the garbage before each diff listing will be examined for interesting things such as file names and revision level (see the section on .Sx Filename Determination below). .Pp The options are as follows: .Bl -tag -width Ds .It Xo .Fl B Ar backup-prefix , .Fl Fl prefix Ar backup-prefix .Xc Causes the next argument to be interpreted as a prefix to the backup file name. If this argument is specified, any argument to .Fl z will be ignored. .It Fl b , Fl Fl backup Save a backup copy of the file before it is modified. By default the original file is saved with a backup extension of .Qq .orig unless the file already has a numbered backup, in which case a numbered backup is made. This is equivalent to specifying .Qo Fl V Cm existing Qc . This option is currently the default, unless .Fl -posix is specified. .It Fl C , Fl Fl check , Fl Fl dry-run Checks that the patch would apply cleanly, but does not modify anything. .It Fl c , Fl Fl context Forces .Nm to interpret the patch file as a context diff. .It Xo .Fl D Ar symbol , .Fl Fl ifdef Ar symbol .Xc Causes .Nm to use the .Qq #ifdef...#endif construct to mark changes. The argument following will be used as the differentiating symbol. Note that, unlike the C compiler, there must be a space between the .Fl D and the argument. .It Xo .Fl d Ar directory , .Fl Fl directory Ar directory .Xc Causes .Nm to interpret the next argument as a directory, and change the working directory to it before doing anything else. .It Fl E , Fl Fl remove-empty-files Causes .Nm to remove output files that are empty after the patches have been applied. This option is useful when applying patches that create or remove files. .It Fl e , Fl Fl ed Forces .Nm to interpret the patch file as an .Xr ed 1 script. .It Xo .Fl F Ar max-fuzz , .Fl Fl fuzz Ar max-fuzz .Xc Sets the maximum fuzz factor. This option only applies to context diffs, and causes .Nm to ignore up to that many lines in looking for places to install a hunk. Note that a larger fuzz factor increases the odds of a faulty patch. The default fuzz factor is 2, and it may not be set to more than the number of lines of context in the context diff, ordinarily 3. .It Fl f , Fl Fl force Forces .Nm to assume that the user knows exactly what he or she is doing, and to not ask any questions. It assumes the following: skip patches for which a file to patch cannot be found; patch files even though they have the wrong version for the .Qq Prereq: line in the patch; and assume that patches are not reversed even if they look like they are. This option does not suppress commentary; use .Fl s for that. .It Xo .Fl i Ar patchfile , .Fl Fl input Ar patchfile .Xc Causes the next argument to be interpreted as the input file name (i.e. a patchfile). This option may be specified multiple times. .It Fl l , Fl Fl ignore-whitespace Causes the pattern matching to be done loosely, in case the tabs and spaces have been munged in your input file. Any sequence of whitespace in the pattern line will match any sequence in the input file. Normal characters must still match exactly. Each line of the context must still match a line in the input file. .It Fl N , Fl Fl forward Causes .Nm to ignore patches that it thinks are reversed or already applied. See also .Fl R . .It Fl n , Fl Fl normal Forces .Nm to interpret the patch file as a normal diff. .It Xo .Fl o Ar out-file , .Fl Fl output Ar out-file .Xc Causes the next argument to be interpreted as the output file name. .It Xo .Fl p Ar strip-count , .Fl Fl strip Ar strip-count .Xc Sets the pathname strip count, which controls how pathnames found in the patch file are treated, in case you keep your files in a different directory than the person who sent out the patch. The strip count specifies how many slashes are to be stripped from the front of the pathname. (Any intervening directory names also go away.) For example, supposing the file name in the patch file was .Pa /u/howard/src/blurfl/blurfl.c : .Pp Setting .Fl p Ns Ar 0 gives the entire pathname unmodified. .Pp .Fl p Ns Ar 1 gives .Pp .D1 Pa u/howard/src/blurfl/blurfl.c .Pp without the leading slash. .Pp .Fl p Ns Ar 4 gives .Pp .D1 Pa blurfl/blurfl.c .Pp Not specifying .Fl p at all just gives you .Pa blurfl.c , unless all of the directories in the leading path .Pq Pa u/howard/src/blurfl exist and that path is relative, in which case you get the entire pathname unmodified. Whatever you end up with is looked for either in the current directory, or the directory specified by the .Fl d option. .It Fl R , Fl Fl reverse Tells .Nm that this patch was created with the old and new files swapped. (Yes, I'm afraid that does happen occasionally, human nature being what it is.) .Nm will attempt to swap each hunk around before applying it. Rejects will come out in the swapped format. The .Fl R option will not work with ed diff scripts because there is too little information to reconstruct the reverse operation. .Pp If the first hunk of a patch fails, .Nm will reverse the hunk to see if it can be applied that way. If it can, you will be asked if you want to have the .Fl R option set. If it cannot, the patch will continue to be applied normally. (Note: this method cannot detect a reversed patch if it is a normal diff and if the first command is an append (i.e. it should have been a delete) since appends always succeed, due to the fact that a null context will match anywhere. Luckily, most patches add or change lines rather than delete them, so most reversed normal diffs will begin with a delete, which will fail, triggering the heuristic.) .It Xo .Fl r Ar rej-name , .Fl Fl reject-file Ar rej-name .Xc Causes the next argument to be interpreted as the reject file name. .It Xo .Fl s , Fl Fl quiet , .Fl Fl silent .Xc Makes .Nm do its work silently, unless an error occurs. .It Fl t , Fl Fl batch Similar to .Fl f , in that it suppresses questions, but makes some different assumptions: skip patches for which a file to patch cannot be found (the same as .Fl f ) ; skip patches for which the file has the wrong version for the .Qq Prereq: line in the patch; and assume that patches are reversed if they look like they are. .It Fl u , Fl Fl unified Forces .Nm to interpret the patch file as a unified context diff (a unidiff). .It Xo -.Fl V Cm t | nil | never , -.Fl Fl version-control Cm t | nil | never +.Fl V Cm t | nil | never | none , +.Fl Fl version-control Cm t | nil | never | none .Xc Causes the next argument to be interpreted as a method for creating backup file names. The type of backups made can also be given in the .Ev PATCH_VERSION_CONTROL or .Ev VERSION_CONTROL environment variables, which are overridden by this option. The .Fl B option overrides this option, causing the prefix to always be used for making backup file names. The values of the .Ev PATCH_VERSION_CONTROL and .Ev VERSION_CONTROL environment variables and the argument to the .Fl V option are like the GNU Emacs .Dq version-control variable; they also recognize synonyms that are more descriptive. The valid values are (unique abbreviations are accepted): .Bl -tag -width Ds -offset indent .It Cm t , numbered Always make numbered backups. .It Cm nil , existing Make numbered backups of files that already have them, simple backups of the others. .It Cm never , simple Always make simple backups. +.It Cm none +Do not make backups. .El .It Fl v , Fl Fl version Causes .Nm to print out its revision header and patch level. .It Xo .Fl x Ar number , .Fl Fl debug Ar number .Xc Sets internal debugging flags, and is of interest only to .Nm patchers. .It Xo .Fl z Ar backup-ext , .Fl Fl suffix Ar backup-ext .Xc Causes the next argument to be interpreted as the backup extension, to be used in place of .Qq .orig . .It Fl Fl posix Enables strict .St -p1003.1-2008 conformance, specifically: .Bl -enum .It Backup files are not created unless the .Fl b option is specified. .It If unspecified, the file name used is the first of the old, new and index files that exists. .El .El .Ss Patch Application .Nm will try to skip any leading garbage, apply the diff, and then skip any trailing garbage. Thus you could feed an article or message containing a diff listing to .Nm , and it should work. If the entire diff is indented by a consistent amount, this will be taken into account. .Pp With context diffs, and to a lesser extent with normal diffs, .Nm can detect when the line numbers mentioned in the patch are incorrect, and will attempt to find the correct place to apply each hunk of the patch. As a first guess, it takes the line number mentioned for the hunk, plus or minus any offset used in applying the previous hunk. If that is not the correct place, .Nm will scan both forwards and backwards for a set of lines matching the context given in the hunk. First .Nm looks for a place where all lines of the context match. If no such place is found, and it's a context diff, and the maximum fuzz factor is set to 1 or more, then another scan takes place ignoring the first and last line of context. If that fails, and the maximum fuzz factor is set to 2 or more, the first two and last two lines of context are ignored, and another scan is made. .Pq The default maximum fuzz factor is 2. .Pp If .Nm cannot find a place to install that hunk of the patch, it will put the hunk out to a reject file, which normally is the name of the output file plus .Qq .rej . (Note that the rejected hunk will come out in context diff form whether the input patch was a context diff or a normal diff. If the input was a normal diff, many of the contexts will simply be null.) The line numbers on the hunks in the reject file may be different than in the patch file: they reflect the approximate location patch thinks the failed hunks belong in the new file rather than the old one. .Pp As each hunk is completed, you will be told whether the hunk succeeded or failed, and which line (in the new file) .Nm thought the hunk should go on. If this is different from the line number specified in the diff, you will be told the offset. A single large offset MAY be an indication that a hunk was installed in the wrong place. You will also be told if a fuzz factor was used to make the match, in which case you should also be slightly suspicious. .Ss Filename Determination If no original file is specified on the command line, .Nm will try to figure out from the leading garbage what the name of the file to edit is. When checking a prospective file name, pathname components are stripped as specified by the .Fl p option and the file's existence and writability are checked relative to the current working directory (or the directory specified by the .Fl d option). .Pp If the diff is a context or unified diff, .Nm is able to determine the old and new file names from the diff header. For context diffs, the .Dq old file is specified in the line beginning with .Qq *** and the .Dq new file is specified in the line beginning with .Qq --- . For a unified diff, the .Dq old file is specified in the line beginning with .Qq --- and the .Dq new file is specified in the line beginning with .Qq +++ . If there is an .Qq Index: line in the leading garbage (regardless of the diff type), .Nm will use the file name from that line as the .Dq index file. .Pp .Nm will choose the file name by performing the following steps, with the first match used: .Bl -enum .It If .Nm is operating in strict .St -p1003.1-2008 mode, the first of the .Dq old , .Dq new and .Dq index file names that exist is used. Otherwise, .Nm will examine either the .Dq old and .Dq new file names or, for a non-context diff, the .Dq index file name, and choose the file name with the fewest path components, the shortest basename, and the shortest total file name length (in that order). .It If no file exists, .Nm checks for the existence of the files in an SCCS or RCS directory (using the appropriate prefix or suffix) using the criteria specified above. If found, .Nm will attempt to get or check out the file. .It If no suitable file was found to patch, the patch file is a context or unified diff, and the old file was zero length, the new file name is created and used. .It If the file name still cannot be determined, .Nm will prompt the user for the file name to use. .El .Pp Additionally, if the leading garbage contains a .Qq Prereq:\ \& line, .Nm will take the first word from the prerequisites line (normally a version number) and check the input file to see if that word can be found. If not, .Nm will ask for confirmation before proceeding. .Pp The upshot of all this is that you should be able to say, while in a news interface, the following: .Pp .Dl | patch -d /usr/src/local/blurfl .Pp and patch a file in the blurfl directory directly from the article containing the patch. .Ss Backup Files By default, the patched version is put in place of the original, with the original file backed up to the same name with the extension .Qq .orig , or as specified by the .Fl B , .Fl V , or .Fl z options. The extension used for making backup files may also be specified in the .Ev SIMPLE_BACKUP_SUFFIX environment variable, which is overridden by the options above. .Pp If the backup file is a symbolic or hard link to the original file, .Nm creates a new backup file name by changing the first lowercase letter in the last component of the file's name into uppercase. If there are no more lowercase letters in the name, it removes the first character from the name. It repeats this process until it comes up with a backup file that does not already exist or is not linked to the original file. .Pp You may also specify where you want the output to go with the .Fl o option; if that file already exists, it is backed up first. .Ss Notes For Patch Senders There are several things you should bear in mind if you are going to be sending out patches: .Pp First, you can save people a lot of grief by keeping a .Pa patchlevel.h file which is patched to increment the patch level as the first diff in the patch file you send out. If you put a .Qq Prereq: line in with the patch, it will not let them apply patches out of order without some warning. .Pp Second, make sure you have specified the file names right, either in a context diff header, or with an .Qq Index: line. If you are patching something in a subdirectory, be sure to tell the patch user to specify a .Fl p option as needed. .Pp Third, you can create a file by sending out a diff that compares a null file to the file you want to create. This will only work if the file you want to create does not exist already in the target directory. .Pp Fourth, take care not to send out reversed patches, since it makes people wonder whether they already applied the patch. .Pp Fifth, while you may be able to get away with putting 582 diff listings into one file, it is probably wiser to group related patches into separate files in case something goes haywire. .Sh ENVIRONMENT .Bl -tag -width "PATCH_VERSION_CONTROL" -compact .It Ev POSIXLY_CORRECT When set, .Nm behaves as if the .Fl Fl posix option has been specified. .It Ev SIMPLE_BACKUP_SUFFIX Extension to use for backup file names instead of .Qq .orig . .It Ev TMPDIR Directory to put temporary files in; default is .Pa /tmp . .It Ev PATCH_VERSION_CONTROL Selects when numbered backup files are made. .It Ev VERSION_CONTROL Same as .Ev PATCH_VERSION_CONTROL . .El .Sh FILES .Bl -tag -width "$TMPDIR/patch*" -compact .It Pa $TMPDIR/patch* .Nm temporary files .It Pa /dev/tty used to read input when .Nm prompts the user .El .Sh EXIT STATUS The .Nm utility exits with one of the following values: .Pp .Bl -tag -width Ds -offset indent -compact .It 0 Successful completion. .It 1 One or more lines were written to a reject file. .It \*(Gt1 An error occurred. .El .Pp When applying a set of patches in a loop it behooves you to check this exit status so you do not apply a later patch to a partially patched file. .Sh DIAGNOSTICS Too many to list here, but generally indicative that .Nm couldn't parse your patch file. .Pp The message .Qq Hmm... indicates that there is unprocessed text in the patch file and that .Nm is attempting to intuit whether there is a patch in that text and, if so, what kind of patch it is. .Sh SEE ALSO .Xr diff 1 .Sh STANDARDS The .Nm utility is compliant with the .St -p1003.1-2008 specification, except as detailed above for the .Fl -posix option. .Pp The flags .Op Fl BCEFfstVvxz and .Op Fl -posix are extensions to that specification. .Sh AUTHORS .An Larry Wall with many other contributors. .Sh CAVEATS .Nm cannot tell if the line numbers are off in an ed script, and can only detect bad line numbers in a normal diff when it finds a .Qq change or a .Qq delete command. A context diff using fuzz factor 3 may have the same problem. Until a suitable interactive interface is added, you should probably do a context diff in these cases to see if the changes made sense. Of course, compiling without errors is a pretty good indication that the patch worked, but not always. .Pp .Nm usually produces the correct results, even when it has to do a lot of guessing. However, the results are guaranteed to be correct only when the patch is applied to exactly the same version of the file that the patch was generated from. .Sh BUGS Could be smarter about partial matches, excessively deviant offsets and swapped code, but that would take an extra pass. .Pp Check patch mode .Pq Fl C will fail if you try to check several patches in succession that build on each other. The entire .Nm code would have to be restructured to keep temporary files around so that it can handle this situation. .Pp If code has been duplicated (for instance with #ifdef OLDCODE ... #else ... #endif), .Nm is incapable of patching both versions, and, if it works at all, will likely patch the wrong one, and tell you that it succeeded to boot. .Pp If you apply a patch you have already applied, .Nm will think it is a reversed patch, and offer to un-apply the patch. This could be construed as a feature. Index: head/usr.bin/patch/patch.c =================================================================== --- head/usr.bin/patch/patch.c (revision 285771) +++ head/usr.bin/patch/patch.c (revision 285772) @@ -1,1079 +1,1082 @@ /*- * 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 */ #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[NAME_MAX + 1]; /* 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 (backup_type == none) { + 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) 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] [-x number] [-z backup-ext]\n" -" [--posix] [origfile [patchfile]]\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) { unsigned short len; const char *line = pfetch(i); len = strnlen(line, USHRT_MAX); 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; 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 */ }