971 lines
23 KiB
C
971 lines
23 KiB
C
char rcsid[] =
|
|
"$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.4 1994/02/25 21:46:04 phk Exp $";
|
|
|
|
/* patch - a program to apply diffs to original files
|
|
*
|
|
* Copyright 1986, Larry Wall
|
|
*
|
|
* This program may be copied as long as you don't try to make any
|
|
* money off of it, or pretend that you wrote it.
|
|
*
|
|
* $Log: patch.c,v $
|
|
* Revision 1.4 1994/02/25 21:46:04 phk
|
|
* added the -C/-check again.
|
|
*
|
|
* Revision 1.3 1994/02/17 22:20:34 jkh
|
|
* Put this back - I was somehow under the erroneous impression that patch was in
|
|
* ports, until I saw the the commit messages, that is! :-) All changed backed out.
|
|
*
|
|
* Revision 1.2 1994/02/17 22:16:03 jkh
|
|
* From Poul-Henning Kamp - Implement a -C option to verify the integrity of
|
|
* a patch before actually applying it.
|
|
*
|
|
* Revision 1.1.1.1 1993/06/19 14:21:52 paul
|
|
* b-maked patch-2.10
|
|
*
|
|
* Revision 2.0.2.0 90/05/01 22:17:50 davison
|
|
* patch12u: unidiff support added
|
|
*
|
|
* Revision 2.0.1.6 88/06/22 20:46:39 lwall
|
|
* patch12: rindex() wasn't declared
|
|
*
|
|
* Revision 2.0.1.5 88/06/03 15:09:37 lwall
|
|
* patch10: exit code improved.
|
|
* patch10: better support for non-flexfilenames.
|
|
*
|
|
* Revision 2.0.1.4 87/02/16 14:00:04 lwall
|
|
* Short replacement caused spurious "Out of sync" message.
|
|
*
|
|
* Revision 2.0.1.3 87/01/30 22:45:50 lwall
|
|
* Improved diagnostic on sync error.
|
|
* Moved do_ed_script() to pch.c.
|
|
*
|
|
* Revision 2.0.1.2 86/11/21 09:39:15 lwall
|
|
* Fuzz factor caused offset of installed lines.
|
|
*
|
|
* Revision 2.0.1.1 86/10/29 13:10:22 lwall
|
|
* Backwards search could terminate prematurely.
|
|
*
|
|
* Revision 2.0 86/09/17 15:37:32 lwall
|
|
* Baseline for netwide release.
|
|
*
|
|
* Revision 1.5 86/08/01 20:53:24 lwall
|
|
* Changed some %d's to %ld's.
|
|
* Linted.
|
|
*
|
|
* Revision 1.4 86/08/01 19:17:29 lwall
|
|
* Fixes for machines that can't vararg.
|
|
* Added fuzz factor.
|
|
* Generalized -p.
|
|
* General cleanup.
|
|
*
|
|
* 85/08/15 van%ucbmonet@berkeley
|
|
* Changes for 4.3bsd diff -c.
|
|
*
|
|
* Revision 1.3 85/03/26 15:07:43 lwall
|
|
* Frozen.
|
|
*
|
|
* Revision 1.2.1.9 85/03/12 17:03:35 lwall
|
|
* Changed pfp->_file to fileno(pfp).
|
|
*
|
|
* Revision 1.2.1.8 85/03/12 16:30:43 lwall
|
|
* Check i_ptr and i_womp to make sure they aren't null before freeing.
|
|
* Also allow ed output to be suppressed.
|
|
*
|
|
* Revision 1.2.1.7 85/03/12 15:56:13 lwall
|
|
* Added -p option from jromine@uci-750a.
|
|
*
|
|
* Revision 1.2.1.6 85/03/12 12:12:51 lwall
|
|
* Now checks for normalness of file to patch.
|
|
*
|
|
* Revision 1.2.1.5 85/03/12 11:52:12 lwall
|
|
* Added -D (#ifdef) option from joe@fluke.
|
|
*
|
|
* Revision 1.2.1.4 84/12/06 11:14:15 lwall
|
|
* Made smarter about SCCS subdirectories.
|
|
*
|
|
* Revision 1.2.1.3 84/12/05 11:18:43 lwall
|
|
* Added -l switch to do loose string comparison.
|
|
*
|
|
* Revision 1.2.1.2 84/12/04 09:47:13 lwall
|
|
* Failed hunk count not reset on multiple patch file.
|
|
*
|
|
* Revision 1.2.1.1 84/12/04 09:42:37 lwall
|
|
* Branch for sdcrdcf changes.
|
|
*
|
|
* Revision 1.2 84/11/29 13:29:51 lwall
|
|
* Linted. Identifiers uniqified. Fixed i_ptr malloc() bug. Fixed
|
|
* multiple calls to mktemp(). Will now work on machines that can only
|
|
* read 32767 chars. Added -R option for diffs with new and old swapped.
|
|
* Various cosmetic changes.
|
|
*
|
|
* Revision 1.1 84/11/09 17:03:58 lwall
|
|
* Initial revision
|
|
*
|
|
*/
|
|
|
|
#include "INTERN.h"
|
|
#include "common.h"
|
|
#include "EXTERN.h"
|
|
#include "version.h"
|
|
#include "util.h"
|
|
#include "pch.h"
|
|
#include "inp.h"
|
|
#include "backupfile.h"
|
|
#include "getopt.h"
|
|
|
|
/* procedures */
|
|
|
|
void reinitialize_almost_everything();
|
|
void get_some_switches();
|
|
LINENUM locate_hunk();
|
|
void abort_hunk();
|
|
void apply_hunk();
|
|
void init_output();
|
|
void init_reject();
|
|
void copy_till();
|
|
void spew_output();
|
|
void dump_line();
|
|
bool patch_match();
|
|
bool similar();
|
|
void re_input();
|
|
void my_exit();
|
|
|
|
/* TRUE if -E was specified on command line. */
|
|
static int remove_empty_files = FALSE;
|
|
|
|
/* TRUE if -R was specified on command line. */
|
|
static int reverse_flag_specified = FALSE;
|
|
|
|
/* TRUE if -C was specified on command line. */
|
|
int check_patch = FALSE;
|
|
|
|
/* Apply a set of diffs as appropriate. */
|
|
|
|
int
|
|
main(argc,argv)
|
|
int argc;
|
|
char **argv;
|
|
{
|
|
LINENUM where;
|
|
LINENUM newwhere;
|
|
LINENUM fuzz;
|
|
LINENUM mymaxfuzz;
|
|
int hunk = 0;
|
|
int failed = 0;
|
|
int failtotal = 0;
|
|
bool rev_okayed = 0;
|
|
int i;
|
|
|
|
setbuf(stderr, serrbuf);
|
|
for (i = 0; i<MAXFILEC; i++)
|
|
filearg[i] = Nullch;
|
|
|
|
myuid = getuid();
|
|
|
|
/* Cons up the names of the temporary files. */
|
|
{
|
|
/* Directory for temporary files. */
|
|
char *tmpdir;
|
|
int tmpname_len;
|
|
|
|
tmpdir = getenv ("TMPDIR");
|
|
if (tmpdir == NULL) {
|
|
tmpdir = "/tmp";
|
|
}
|
|
tmpname_len = strlen (tmpdir) + 20;
|
|
|
|
TMPOUTNAME = (char *) malloc (tmpname_len);
|
|
strcpy (TMPOUTNAME, tmpdir);
|
|
strcat (TMPOUTNAME, "/patchoXXXXXX");
|
|
Mktemp(TMPOUTNAME);
|
|
|
|
TMPINNAME = (char *) malloc (tmpname_len);
|
|
strcpy (TMPINNAME, tmpdir);
|
|
strcat (TMPINNAME, "/patchiXXXXXX");
|
|
Mktemp(TMPINNAME);
|
|
|
|
TMPREJNAME = (char *) malloc (tmpname_len);
|
|
strcpy (TMPREJNAME, tmpdir);
|
|
strcat (TMPREJNAME, "/patchrXXXXXX");
|
|
Mktemp(TMPREJNAME);
|
|
|
|
TMPPATNAME = (char *) malloc (tmpname_len);
|
|
strcpy (TMPPATNAME, tmpdir);
|
|
strcat (TMPPATNAME, "/patchpXXXXXX");
|
|
Mktemp(TMPPATNAME);
|
|
}
|
|
|
|
{
|
|
char *v;
|
|
|
|
v = getenv ("SIMPLE_BACKUP_SUFFIX");
|
|
if (v)
|
|
simple_backup_suffix = v;
|
|
else
|
|
simple_backup_suffix = ".orig";
|
|
#ifndef NODIR
|
|
v = getenv ("VERSION_CONTROL");
|
|
backup_type = get_version (v); /* OK to pass NULL. */
|
|
#endif
|
|
}
|
|
|
|
/* parse switches */
|
|
Argc = argc;
|
|
Argv = argv;
|
|
get_some_switches();
|
|
|
|
/* make sure we clean up /tmp in case of disaster */
|
|
set_signals(0);
|
|
|
|
for (
|
|
open_patch_file(filearg[1]);
|
|
there_is_another_patch();
|
|
reinitialize_almost_everything()
|
|
) { /* for each patch in patch file */
|
|
|
|
if (outname == Nullch)
|
|
outname = savestr(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;
|
|
rev_okayed = FALSE;
|
|
out_of_mem = FALSE;
|
|
while (another_hunk()) {
|
|
hunk++;
|
|
fuzz = Nulline;
|
|
mymaxfuzz = pch_context();
|
|
if (maxfuzz < mymaxfuzz)
|
|
mymaxfuzz = maxfuzz;
|
|
if (!skip_rest_of_patch) {
|
|
do {
|
|
where = locate_hunk(fuzz);
|
|
if (hunk == 1 && where == Nulline && !(force|rev_okayed)) {
|
|
/* dwim for reversed patch? */
|
|
if (!pch_swap()) {
|
|
if (fuzz == Nulline)
|
|
say1(
|
|
"Not enough memory to try swapped hunk! Assuming unswapped.\n");
|
|
continue;
|
|
}
|
|
reverse = !reverse;
|
|
where = locate_hunk(fuzz); /* try again */
|
|
if (where == Nulline) { /* didn't find it swapped */
|
|
if (!pch_swap()) /* put it back to normal */
|
|
fatal1("lost hunk on alloc error!\n");
|
|
reverse = !reverse;
|
|
}
|
|
else if (noreverse) {
|
|
if (!pch_swap()) /* put it back to normal */
|
|
fatal1("lost hunk on alloc error!\n");
|
|
reverse = !reverse;
|
|
say1(
|
|
"Ignoring previously applied (or reversed) patch.\n");
|
|
skip_rest_of_patch = TRUE;
|
|
}
|
|
else if (batch) {
|
|
if (verbose)
|
|
say3(
|
|
"%seversed (or previously applied) patch detected! %s -R.",
|
|
reverse ? "R" : "Unr",
|
|
reverse ? "Assuming" : "Ignoring");
|
|
}
|
|
else {
|
|
ask3(
|
|
"%seversed (or previously applied) patch detected! %s -R? [y] ",
|
|
reverse ? "R" : "Unr",
|
|
reverse ? "Assume" : "Ignore");
|
|
if (*buf == 'n') {
|
|
ask1("Apply anyway? [n] ");
|
|
if (*buf == 'y')
|
|
rev_okayed = TRUE;
|
|
else
|
|
skip_rest_of_patch = TRUE;
|
|
where = Nulline;
|
|
reverse = !reverse;
|
|
if (!pch_swap()) /* put it back to normal */
|
|
fatal1("lost hunk on alloc error!\n");
|
|
}
|
|
}
|
|
}
|
|
} while (!skip_rest_of_patch && where == Nulline &&
|
|
++fuzz <= mymaxfuzz);
|
|
|
|
if (skip_rest_of_patch) { /* just got decided */
|
|
Fclose(ofp);
|
|
ofp = Nullfp;
|
|
}
|
|
}
|
|
|
|
newwhere = pch_newfirst() + last_offset;
|
|
if (skip_rest_of_patch) {
|
|
abort_hunk();
|
|
failed++;
|
|
if (verbose)
|
|
say3("Hunk #%d ignored at %ld.\n", hunk, newwhere);
|
|
}
|
|
else if (where == Nulline) {
|
|
abort_hunk();
|
|
failed++;
|
|
if (verbose)
|
|
say3("Hunk #%d failed at %ld.\n", hunk, newwhere);
|
|
}
|
|
else {
|
|
apply_hunk(where);
|
|
if (verbose) {
|
|
say3("Hunk #%d succeeded at %ld", hunk, newwhere);
|
|
if (fuzz)
|
|
say2(" with fuzz %ld", fuzz);
|
|
if (last_offset)
|
|
say3(" (offset %ld line%s)",
|
|
last_offset, last_offset==1L?"":"s");
|
|
say1(".\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
if (out_of_mem && using_plan_a) {
|
|
optind = optind_last;
|
|
say1("\n\nRan out of memory using Plan A--trying again...\n\n");
|
|
if (ofp)
|
|
Fclose(ofp);
|
|
ofp = Nullfp;
|
|
if (rejfp)
|
|
Fclose(rejfp);
|
|
rejfp = Nullfp;
|
|
continue;
|
|
}
|
|
|
|
assert(hunk);
|
|
|
|
/* finish spewing out the new file */
|
|
if (!skip_rest_of_patch)
|
|
spew_output();
|
|
|
|
/* and put the output where desired */
|
|
ignore_signals();
|
|
if (!skip_rest_of_patch) {
|
|
struct stat statbuf;
|
|
char *realout = outname;
|
|
|
|
if (check_patch) {
|
|
;
|
|
} else 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)
|
|
say2("Removing %s (empty after patching).\n", realout);
|
|
while (unlink(realout) >= 0) ; /* while is for Eunice. */
|
|
}
|
|
}
|
|
Fclose(rejfp);
|
|
rejfp = Nullfp;
|
|
if (failed) {
|
|
failtotal += failed;
|
|
if (!*rejname) {
|
|
Strcpy(rejname, outname);
|
|
addext(rejname, ".rej", '#');
|
|
}
|
|
if (skip_rest_of_patch) {
|
|
say4("%d out of %d hunks ignored--saving rejects to %s\n",
|
|
failed, hunk, rejname);
|
|
}
|
|
else {
|
|
say4("%d out of %d hunks failed--saving rejects to %s\n",
|
|
failed, hunk, rejname);
|
|
}
|
|
if (check_patch) {
|
|
;
|
|
} else if (move_file(TMPREJNAME, rejname) < 0)
|
|
trejkeep = TRUE;
|
|
}
|
|
set_signals(1);
|
|
}
|
|
my_exit(failtotal);
|
|
}
|
|
|
|
/* Prepare to find the next patch to do in the patch file. */
|
|
|
|
void
|
|
reinitialize_almost_everything()
|
|
{
|
|
re_patch();
|
|
re_input();
|
|
|
|
input_lines = 0;
|
|
last_frozen_line = 0;
|
|
|
|
filec = 0;
|
|
if (filearg[0] != Nullch && !out_of_mem) {
|
|
free(filearg[0]);
|
|
filearg[0] = Nullch;
|
|
}
|
|
|
|
if (outname != Nullch) {
|
|
free(outname);
|
|
outname = Nullch;
|
|
}
|
|
|
|
last_offset = 0;
|
|
|
|
diff_type = 0;
|
|
|
|
if (revision != Nullch) {
|
|
free(revision);
|
|
revision = Nullch;
|
|
}
|
|
|
|
reverse = reverse_flag_specified;
|
|
skip_rest_of_patch = FALSE;
|
|
|
|
get_some_switches();
|
|
|
|
if (filec >= 2)
|
|
fatal1("you may not change to a different patch file\n");
|
|
}
|
|
|
|
static char *shortopts = "-b:B:cCd:D:eEfF:lnNo:p::r:RsStuvV:x:";
|
|
static struct option longopts[] =
|
|
{
|
|
{"suffix", 1, NULL, 'b'},
|
|
{"prefix", 1, NULL, 'B'},
|
|
{"check", 0, NULL, 'C'},
|
|
{"context", 0, NULL, 'c'},
|
|
{"directory", 1, NULL, 'd'},
|
|
{"ifdef", 1, NULL, 'D'},
|
|
{"ed", 0, NULL, 'e'},
|
|
{"remove-empty-files", 0, NULL, 'E'},
|
|
{"force", 0, NULL, 'f'},
|
|
{"fuzz", 1, NULL, 'F'},
|
|
{"ignore-whitespace", 0, NULL, 'l'},
|
|
{"normal", 0, NULL, 'n'},
|
|
{"forward", 0, NULL, 'N'},
|
|
{"output", 1, NULL, 'o'},
|
|
{"strip", 2, NULL, 'p'},
|
|
{"reject-file", 1, NULL, 'r'},
|
|
{"reverse", 0, NULL, 'R'},
|
|
{"quiet", 0, NULL, 's'},
|
|
{"silent", 0, NULL, 's'},
|
|
{"skip", 0, NULL, 'S'},
|
|
{"batch", 0, NULL, 't'},
|
|
{"unified", 0, NULL, 'u'},
|
|
{"version", 0, NULL, 'v'},
|
|
{"version-control", 1, NULL, 'V'},
|
|
{"debug", 1, NULL, 'x'},
|
|
{0, 0, 0, 0}
|
|
};
|
|
|
|
/* Process switches and filenames up to next '+' or end of list. */
|
|
|
|
void
|
|
get_some_switches()
|
|
{
|
|
Reg1 int optc;
|
|
|
|
rejname[0] = '\0';
|
|
optind_last = optind;
|
|
if (optind == Argc)
|
|
return;
|
|
while ((optc = getopt_long (Argc, Argv, shortopts, longopts, (int *) 0))
|
|
!= -1) {
|
|
if (optc == 1) {
|
|
if (strEQ(optarg, "+"))
|
|
return;
|
|
if (filec == MAXFILEC)
|
|
fatal1("too many file arguments\n");
|
|
filearg[filec++] = savestr(optarg);
|
|
}
|
|
else {
|
|
switch (optc) {
|
|
case 'b':
|
|
simple_backup_suffix = savestr(optarg);
|
|
break;
|
|
case 'B':
|
|
origprae = savestr(optarg);
|
|
break;
|
|
case 'c':
|
|
diff_type = CONTEXT_DIFF;
|
|
break;
|
|
case 'C':
|
|
check_patch = TRUE;
|
|
break;
|
|
case 'd':
|
|
if (chdir(optarg) < 0)
|
|
pfatal2("can't cd to %s", optarg);
|
|
break;
|
|
case 'D':
|
|
do_defines = TRUE;
|
|
if (!isalpha(*optarg) && '_' != *optarg)
|
|
fatal1("argument to -D is not an identifier\n");
|
|
Sprintf(if_defined, "#ifdef %s\n", optarg);
|
|
Sprintf(not_defined, "#ifndef %s\n", optarg);
|
|
Sprintf(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 'l':
|
|
canonicalize = TRUE;
|
|
break;
|
|
case 'n':
|
|
diff_type = NORMAL_DIFF;
|
|
break;
|
|
case 'N':
|
|
noreverse = TRUE;
|
|
break;
|
|
case 'o':
|
|
outname = savestr(optarg);
|
|
break;
|
|
case 'p':
|
|
if (optarg)
|
|
strippath = atoi(optarg);
|
|
else
|
|
strippath = 0;
|
|
break;
|
|
case 'r':
|
|
Strcpy(rejname, optarg);
|
|
break;
|
|
case 'R':
|
|
reverse = TRUE;
|
|
reverse_flag_specified = TRUE;
|
|
break;
|
|
case 's':
|
|
verbose = FALSE;
|
|
break;
|
|
case 'S':
|
|
skip_rest_of_patch = TRUE;
|
|
break;
|
|
case 't':
|
|
batch = TRUE;
|
|
break;
|
|
case 'u':
|
|
diff_type = UNI_DIFF;
|
|
break;
|
|
case 'v':
|
|
version();
|
|
break;
|
|
case 'V':
|
|
#ifndef NODIR
|
|
backup_type = get_version (optarg);
|
|
#endif
|
|
break;
|
|
#ifdef DEBUGGING
|
|
case 'x':
|
|
debug = atoi(optarg);
|
|
break;
|
|
#endif
|
|
default:
|
|
fprintf(stderr, "\
|
|
Usage: %s [options] [origfile [patchfile]] [+ [options] [origfile]]...\n",
|
|
Argv[0]);
|
|
fprintf(stderr, "\
|
|
Options:\n\
|
|
[-cCeEflnNRsStuv] [-b backup-ext] [-B backup-prefix] [-d directory]\n\
|
|
[-D symbol] [-F max-fuzz] [-o out-file] [-p[strip-count]]\n\
|
|
[-r rej-name] [-V {numbered,existing,simple}] [--check] [--context]\n\
|
|
[--prefix=backup-prefix] [--suffix=backup-ext] [--ifdef=symbol]\n\
|
|
[--directory=directory] [--ed] [--fuzz=max-fuzz] [--force] [--batch]\n\
|
|
[--ignore-whitespace] [--forward] [--reverse] [--output=out-file]\n");
|
|
fprintf(stderr, "\
|
|
[--strip[=strip-count]] [--normal] [--reject-file=rej-name] [--skip]\n\
|
|
[--remove-empty-files] [--quiet] [--silent] [--unified] [--version]\n\
|
|
[--version-control={numbered,existing,simple}]\n");
|
|
my_exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Process any filename args given after "--". */
|
|
for (; optind < Argc; ++optind) {
|
|
if (filec == MAXFILEC)
|
|
fatal1("too many file arguments\n");
|
|
filearg[filec++] = savestr(Argv[optind]);
|
|
}
|
|
}
|
|
|
|
/* Attempt to find the right place to apply this hunk of patch. */
|
|
|
|
LINENUM
|
|
locate_hunk(fuzz)
|
|
LINENUM fuzz;
|
|
{
|
|
Reg1 LINENUM first_guess = pch_first() + last_offset;
|
|
Reg2 LINENUM offset;
|
|
LINENUM pat_lines = pch_ptrn_lines();
|
|
Reg3 LINENUM max_pos_offset = input_lines - first_guess
|
|
- pat_lines + 1;
|
|
Reg4 LINENUM max_neg_offset = first_guess - last_frozen_line - 1
|
|
+ pch_context();
|
|
|
|
if (!pat_lines) /* null range matches always */
|
|
return first_guess;
|
|
if (max_neg_offset >= first_guess) /* do not try lines < 0 */
|
|
max_neg_offset = first_guess - 1;
|
|
if (first_guess <= input_lines && patch_match(first_guess, Nulline, fuzz))
|
|
return first_guess;
|
|
for (offset = 1; ; offset++) {
|
|
Reg5 bool check_after = (offset <= max_pos_offset);
|
|
Reg6 bool check_before = (offset <= max_neg_offset);
|
|
|
|
if (check_after && patch_match(first_guess, offset, fuzz)) {
|
|
#ifdef DEBUGGING
|
|
if (debug & 1)
|
|
say3("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)
|
|
say3("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 Nulline;
|
|
}
|
|
}
|
|
|
|
/* We did not find the pattern, dump out the hunk so they can handle it. */
|
|
|
|
void
|
|
abort_hunk()
|
|
{
|
|
Reg1 LINENUM i;
|
|
Reg2 LINENUM pat_end = pch_end();
|
|
/* add in last_offset to guess the same as the previous successful hunk */
|
|
LINENUM oldfirst = pch_first() + last_offset;
|
|
LINENUM newfirst = pch_newfirst() + last_offset;
|
|
LINENUM oldlast = oldfirst + pch_ptrn_lines() - 1;
|
|
LINENUM newlast = newfirst + pch_repl_lines() - 1;
|
|
char *stars = (diff_type >= NEW_CONTEXT_DIFF ? " ****" : "");
|
|
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:
|
|
fatal1("fatal internal error in abort_hunk\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
/* We found where to apply it (we hope), so do it. */
|
|
|
|
void
|
|
apply_hunk(where)
|
|
LINENUM where;
|
|
{
|
|
Reg1 LINENUM old = 1;
|
|
Reg2 LINENUM lastline = pch_ptrn_lines();
|
|
Reg3 LINENUM new = lastline+1;
|
|
#define OUTSIDE 0
|
|
#define IN_IFNDEF 1
|
|
#define IN_IFDEF 2
|
|
#define IN_ELSE 3
|
|
Reg4 int def_state = OUTSIDE;
|
|
Reg5 bool R_do_defines = do_defines;
|
|
Reg6 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);
|
|
if (R_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);
|
|
if (R_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)) {
|
|
say3("Out-of-sync patch, lines %ld,%ld--mangled text or line numbers, maybe?\n",
|
|
pch_hunk_beg() + old,
|
|
pch_hunk_beg() + new);
|
|
#ifdef DEBUGGING
|
|
say3("oldchar = '%c', newchar = '%c'\n",
|
|
pch_char(old), pch_char(new));
|
|
#endif
|
|
my_exit(1);
|
|
}
|
|
else if (pch_char(new) == '!') {
|
|
copy_till(where + old - 1);
|
|
if (R_do_defines) {
|
|
fputs(not_defined, ofp);
|
|
def_state = IN_IFNDEF;
|
|
}
|
|
while (pch_char(old) == '!') {
|
|
if (R_do_defines) {
|
|
fputs(pfetch(old), ofp);
|
|
}
|
|
last_frozen_line++;
|
|
old++;
|
|
}
|
|
if (R_do_defines) {
|
|
fputs(else_defined, ofp);
|
|
def_state = IN_ELSE;
|
|
}
|
|
while (pch_char(new) == '!') {
|
|
fputs(pfetch(new), ofp);
|
|
new++;
|
|
}
|
|
}
|
|
else {
|
|
assert(pch_char(new) == ' ');
|
|
old++;
|
|
new++;
|
|
if (R_do_defines && def_state != OUTSIDE) {
|
|
fputs(end_defined, ofp);
|
|
def_state = OUTSIDE;
|
|
}
|
|
}
|
|
}
|
|
if (new <= pat_end && pch_char(new) == '+') {
|
|
copy_till(where + old - 1);
|
|
if (R_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 (R_do_defines && def_state != OUTSIDE) {
|
|
fputs(end_defined, ofp);
|
|
}
|
|
}
|
|
|
|
/* Open the new file. */
|
|
|
|
void
|
|
init_output(name)
|
|
char *name;
|
|
{
|
|
ofp = fopen(name, "w");
|
|
if (ofp == Nullfp)
|
|
pfatal2("can't create %s", name);
|
|
}
|
|
|
|
/* Open a file to put hunks we can't locate. */
|
|
|
|
void
|
|
init_reject(name)
|
|
char *name;
|
|
{
|
|
rejfp = fopen(name, "w");
|
|
if (rejfp == Nullfp)
|
|
pfatal2("can't create %s", name);
|
|
}
|
|
|
|
/* Copy input file to output, up to wherever hunk is to be applied. */
|
|
|
|
void
|
|
copy_till(lastline)
|
|
Reg1 LINENUM lastline;
|
|
{
|
|
Reg2 LINENUM R_last_frozen_line = last_frozen_line;
|
|
|
|
if (R_last_frozen_line > lastline)
|
|
fatal1("misordered hunks! output would be garbled\n");
|
|
while (R_last_frozen_line < lastline) {
|
|
dump_line(++R_last_frozen_line);
|
|
}
|
|
last_frozen_line = R_last_frozen_line;
|
|
}
|
|
|
|
/* Finish copying the input file to the output file. */
|
|
|
|
void
|
|
spew_output()
|
|
{
|
|
#ifdef DEBUGGING
|
|
if (debug & 256)
|
|
say3("il=%ld lfl=%ld\n",input_lines,last_frozen_line);
|
|
#endif
|
|
if (input_lines)
|
|
copy_till(input_lines); /* dump remainder of file */
|
|
Fclose(ofp);
|
|
ofp = Nullfp;
|
|
}
|
|
|
|
/* Copy one line from input to output. */
|
|
|
|
void
|
|
dump_line(line)
|
|
LINENUM line;
|
|
{
|
|
Reg1 char *s;
|
|
Reg2 char R_newline = '\n';
|
|
|
|
/* Note: string is not null terminated. */
|
|
for (s=ifetch(line, 0); putc(*s, ofp) != R_newline; s++) ;
|
|
}
|
|
|
|
/* Does the patch pattern match at line base+offset? */
|
|
|
|
bool
|
|
patch_match(base, offset, fuzz)
|
|
LINENUM base;
|
|
LINENUM offset;
|
|
LINENUM fuzz;
|
|
{
|
|
Reg1 LINENUM pline = 1 + fuzz;
|
|
Reg2 LINENUM iline;
|
|
Reg3 LINENUM pat_lines = pch_ptrn_lines() - fuzz;
|
|
|
|
for (iline=base+offset+fuzz; pline <= pat_lines; pline++,iline++) {
|
|
if (canonicalize) {
|
|
if (!similar(ifetch(iline, (offset >= 0)),
|
|
pfetch(pline),
|
|
pch_line_len(pline) ))
|
|
return FALSE;
|
|
}
|
|
else if (strnNE(ifetch(iline, (offset >= 0)),
|
|
pfetch(pline),
|
|
pch_line_len(pline) ))
|
|
return FALSE;
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
/* Do two lines match with canonicalized white space? */
|
|
|
|
bool
|
|
similar(a,b,len)
|
|
Reg1 char *a;
|
|
Reg2 char *b;
|
|
Reg3 int len;
|
|
{
|
|
while (len) {
|
|
if (isspace(*b)) { /* whitespace (or \n) to match? */
|
|
if (!isspace(*a)) /* no corresponding whitespace? */
|
|
return FALSE;
|
|
while (len && isspace(*b) && *b != '\n')
|
|
b++,len--; /* skip pattern whitespace */
|
|
while (isspace(*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 */
|
|
}
|
|
|
|
/* Exit with cleanup. */
|
|
|
|
void
|
|
my_exit(status)
|
|
int status;
|
|
{
|
|
Unlink(TMPINNAME);
|
|
if (!toutkeep) {
|
|
Unlink(TMPOUTNAME);
|
|
}
|
|
if (!trejkeep) {
|
|
Unlink(TMPREJNAME);
|
|
}
|
|
Unlink(TMPPATNAME);
|
|
exit(status);
|
|
}
|