Home | History | Annotate | Line # | Download | only in patch
pch.c revision 1.8
      1  1.8  kristerw /*	$NetBSD: pch.c,v 1.8 2002/03/08 21:57:33 kristerw Exp $	*/
      2  1.5  christos #include <sys/cdefs.h>
      3  1.2   mycroft #ifndef lint
      4  1.8  kristerw __RCSID("$NetBSD: pch.c,v 1.8 2002/03/08 21:57:33 kristerw Exp $");
      5  1.2   mycroft #endif /* not lint */
      6  1.1       cgd 
      7  1.1       cgd #include "EXTERN.h"
      8  1.1       cgd #include "common.h"
      9  1.1       cgd #include "util.h"
     10  1.1       cgd #include "INTERN.h"
     11  1.1       cgd #include "pch.h"
     12  1.1       cgd 
     13  1.5  christos #include <stdlib.h>
     14  1.5  christos #include <unistd.h>
     15  1.5  christos 
     16  1.1       cgd /* Patch (diff listing) abstract type. */
     17  1.1       cgd 
     18  1.1       cgd static long p_filesize;			/* size of the patch file */
     19  1.1       cgd static LINENUM p_first;			/* 1st line number */
     20  1.1       cgd static LINENUM p_newfirst;		/* 1st line number of replacement */
     21  1.1       cgd static LINENUM p_ptrn_lines;		/* # lines in pattern */
     22  1.1       cgd static LINENUM p_repl_lines;		/* # lines in replacement text */
     23  1.1       cgd static LINENUM p_end = -1;		/* last line in hunk */
     24  1.1       cgd static LINENUM p_max;			/* max allowed value of p_end */
     25  1.1       cgd static LINENUM p_context = 3;		/* # of context lines */
     26  1.1       cgd static LINENUM p_input_line = 0;	/* current line # from patch file */
     27  1.1       cgd static char **p_line = Null(char**);	/* the text of the hunk */
     28  1.1       cgd static short *p_len = Null(short*);	/* length of each line */
     29  1.1       cgd static char *p_char = Nullch;		/* +, -, and ! */
     30  1.1       cgd static int hunkmax = INITHUNKMAX;	/* size of above arrays to begin with */
     31  1.1       cgd static int p_indent;			/* indent to patch */
     32  1.1       cgd static LINENUM p_base;			/* where to intuit this time */
     33  1.1       cgd static LINENUM p_bline;			/* line # of p_base */
     34  1.1       cgd static LINENUM p_start;			/* where intuit found a patch */
     35  1.1       cgd static LINENUM p_sline;			/* and the line number for it */
     36  1.1       cgd static LINENUM p_hunk_beg;		/* line number of current hunk */
     37  1.1       cgd static LINENUM p_efake = -1;		/* end of faked up lines--don't free */
     38  1.1       cgd static LINENUM p_bfake = -1;		/* beg of faked up lines */
     39  1.1       cgd 
     40  1.1       cgd /* Prepare to look for the next patch in the patch file. */
     41  1.8  kristerw static void malformed(void);
     42  1.1       cgd 
     43  1.1       cgd void
     44  1.8  kristerw re_patch(void)
     45  1.1       cgd {
     46  1.1       cgd     p_first = Nulline;
     47  1.1       cgd     p_newfirst = Nulline;
     48  1.1       cgd     p_ptrn_lines = Nulline;
     49  1.1       cgd     p_repl_lines = Nulline;
     50  1.1       cgd     p_end = (LINENUM)-1;
     51  1.1       cgd     p_max = Nulline;
     52  1.1       cgd     p_indent = 0;
     53  1.1       cgd }
     54  1.1       cgd 
     55  1.1       cgd /* Open the patch file at the beginning of time. */
     56  1.1       cgd 
     57  1.1       cgd void
     58  1.8  kristerw open_patch_file(char *filename)
     59  1.1       cgd {
     60  1.1       cgd     if (filename == Nullch || !*filename || strEQ(filename, "-")) {
     61  1.1       cgd 	pfp = fopen(TMPPATNAME, "w");
     62  1.1       cgd 	if (pfp == Nullfp)
     63  1.1       cgd 	    pfatal2("can't create %s", TMPPATNAME);
     64  1.1       cgd 	while (fgets(buf, sizeof buf, stdin) != Nullch)
     65  1.1       cgd 	    fputs(buf, pfp);
     66  1.1       cgd 	Fclose(pfp);
     67  1.1       cgd 	filename = TMPPATNAME;
     68  1.1       cgd     }
     69  1.1       cgd     pfp = fopen(filename, "r");
     70  1.1       cgd     if (pfp == Nullfp)
     71  1.1       cgd 	pfatal2("patch file %s not found", filename);
     72  1.1       cgd     Fstat(fileno(pfp), &filestat);
     73  1.1       cgd     p_filesize = filestat.st_size;
     74  1.1       cgd     next_intuit_at(0L,1L);			/* start at the beginning */
     75  1.1       cgd     set_hunkmax();
     76  1.1       cgd }
     77  1.1       cgd 
     78  1.1       cgd /* Make sure our dynamically realloced tables are malloced to begin with. */
     79  1.1       cgd 
     80  1.1       cgd void
     81  1.8  kristerw set_hunkmax(void)
     82  1.1       cgd {
     83  1.8  kristerw     if (p_line == NULL)
     84  1.1       cgd 	p_line = (char**) malloc((MEM)hunkmax * sizeof(char *));
     85  1.8  kristerw     if (p_len == NULL)
     86  1.1       cgd 	p_len  = (short*) malloc((MEM)hunkmax * sizeof(short));
     87  1.8  kristerw     if (p_char == NULL)
     88  1.1       cgd 	p_char = (char*)  malloc((MEM)hunkmax * sizeof(char));
     89  1.1       cgd }
     90  1.1       cgd 
     91  1.1       cgd /* Enlarge the arrays containing the current hunk of patch. */
     92  1.1       cgd 
     93  1.1       cgd void
     94  1.8  kristerw grow_hunkmax(void)
     95  1.1       cgd {
     96  1.1       cgd     hunkmax *= 2;
     97  1.1       cgd     /*
     98  1.1       cgd      * Note that on most systems, only the p_line array ever gets fresh memory
     99  1.1       cgd      * since p_len can move into p_line's old space, and p_char can move into
    100  1.1       cgd      * p_len's old space.  Not on PDP-11's however.  But it doesn't matter.
    101  1.1       cgd      */
    102  1.1       cgd     assert(p_line != Null(char**) && p_len != Null(short*) && p_char != Nullch);
    103  1.8  kristerw     p_line = (char**) realloc(p_line, (MEM)hunkmax * sizeof(char *));
    104  1.8  kristerw     p_len  = (short*) realloc(p_len,  (MEM)hunkmax * sizeof(short));
    105  1.8  kristerw     p_char = (char*)  realloc(p_char, (MEM)hunkmax * sizeof(char));
    106  1.1       cgd     if (p_line != Null(char**) && p_len != Null(short*) && p_char != Nullch)
    107  1.1       cgd 	return;
    108  1.1       cgd     if (!using_plan_a)
    109  1.1       cgd 	fatal1("out of memory\n");
    110  1.1       cgd     out_of_mem = TRUE;		/* whatever is null will be allocated again */
    111  1.1       cgd 				/* from within plan_a(), of all places */
    112  1.1       cgd }
    113  1.1       cgd 
    114  1.1       cgd /* True if the remainder of the patch file contains a diff of some sort. */
    115  1.1       cgd 
    116  1.1       cgd bool
    117  1.8  kristerw there_is_another_patch(void)
    118  1.1       cgd {
    119  1.1       cgd     if (p_base != 0L && p_base >= p_filesize) {
    120  1.1       cgd 	if (verbose)
    121  1.1       cgd 	    say1("done\n");
    122  1.1       cgd 	return FALSE;
    123  1.1       cgd     }
    124  1.1       cgd     if (verbose)
    125  1.1       cgd 	say1("Hmm...");
    126  1.1       cgd     diff_type = intuit_diff_type();
    127  1.1       cgd     if (!diff_type) {
    128  1.1       cgd 	if (p_base != 0L) {
    129  1.1       cgd 	    if (verbose)
    130  1.1       cgd 		say1("  Ignoring the trailing garbage.\ndone\n");
    131  1.1       cgd 	}
    132  1.1       cgd 	else
    133  1.1       cgd 	    say1("  I can't seem to find a patch in there anywhere.\n");
    134  1.1       cgd 	return FALSE;
    135  1.1       cgd     }
    136  1.1       cgd     if (verbose)
    137  1.1       cgd 	say3("  %sooks like %s to me...\n",
    138  1.1       cgd 	    (p_base == 0L ? "L" : "The next patch l"),
    139  1.1       cgd 	    diff_type == UNI_DIFF ? "a unified diff" :
    140  1.1       cgd 	    diff_type == CONTEXT_DIFF ? "a context diff" :
    141  1.1       cgd 	    diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" :
    142  1.1       cgd 	    diff_type == NORMAL_DIFF ? "a normal diff" :
    143  1.1       cgd 	    "an ed script" );
    144  1.1       cgd     if (p_indent && verbose)
    145  1.1       cgd 	say3("(Patch is indented %d space%s.)\n", p_indent, p_indent==1?"":"s");
    146  1.1       cgd     skip_to(p_start,p_sline);
    147  1.1       cgd     while (filearg[0] == Nullch) {
    148  1.1       cgd 	if (force || batch) {
    149  1.1       cgd 	    say1("No file to patch.  Skipping...\n");
    150  1.1       cgd 	    filearg[0] = savestr(bestguess);
    151  1.4      phil 	    skip_rest_of_patch = TRUE;
    152  1.1       cgd 	    return TRUE;
    153  1.1       cgd 	}
    154  1.1       cgd 	ask1("File to patch: ");
    155  1.1       cgd 	if (*buf != '\n') {
    156  1.1       cgd 	    if (bestguess)
    157  1.1       cgd 		free(bestguess);
    158  1.1       cgd 	    bestguess = savestr(buf);
    159  1.1       cgd 	    filearg[0] = fetchname(buf, 0, FALSE);
    160  1.1       cgd 	}
    161  1.1       cgd 	if (filearg[0] == Nullch) {
    162  1.1       cgd 	    ask1("No file found--skip this patch? [n] ");
    163  1.1       cgd 	    if (*buf != 'y') {
    164  1.1       cgd 		continue;
    165  1.1       cgd 	    }
    166  1.1       cgd 	    if (verbose)
    167  1.1       cgd 		say1("Skipping patch...\n");
    168  1.1       cgd 	    filearg[0] = fetchname(bestguess, 0, TRUE);
    169  1.1       cgd 	    skip_rest_of_patch = TRUE;
    170  1.1       cgd 	    return TRUE;
    171  1.1       cgd 	}
    172  1.1       cgd     }
    173  1.1       cgd     return TRUE;
    174  1.1       cgd }
    175  1.1       cgd 
    176  1.1       cgd /* Determine what kind of diff is in the remaining part of the patch file. */
    177  1.1       cgd 
    178  1.1       cgd int
    179  1.8  kristerw intuit_diff_type(void)
    180  1.1       cgd {
    181  1.8  kristerw     long this_line = 0;
    182  1.8  kristerw     long previous_line;
    183  1.8  kristerw     long first_command_line = -1;
    184  1.5  christos     long fcl_line = -1;
    185  1.8  kristerw     bool last_line_was_command = FALSE;
    186  1.8  kristerw     bool this_is_a_command = FALSE;
    187  1.8  kristerw     bool stars_last_line = FALSE;
    188  1.8  kristerw     bool stars_this_line = FALSE;
    189  1.8  kristerw     int indent;
    190  1.8  kristerw     char *s;
    191  1.8  kristerw     char *t;
    192  1.1       cgd     char *indtmp = Nullch;
    193  1.1       cgd     char *oldtmp = Nullch;
    194  1.1       cgd     char *newtmp = Nullch;
    195  1.1       cgd     char *indname = Nullch;
    196  1.1       cgd     char *oldname = Nullch;
    197  1.1       cgd     char *newname = Nullch;
    198  1.8  kristerw     int retval;
    199  1.1       cgd     bool no_filearg = (filearg[0] == Nullch);
    200  1.1       cgd 
    201  1.1       cgd     ok_to_create_file = FALSE;
    202  1.7  sommerfe     old_file_is_dev_null = FALSE;
    203  1.1       cgd     Fseek(pfp, p_base, 0);
    204  1.1       cgd     p_input_line = p_bline - 1;
    205  1.1       cgd     for (;;) {
    206  1.1       cgd 	previous_line = this_line;
    207  1.1       cgd 	last_line_was_command = this_is_a_command;
    208  1.1       cgd 	stars_last_line = stars_this_line;
    209  1.1       cgd 	this_line = ftell(pfp);
    210  1.1       cgd 	indent = 0;
    211  1.1       cgd 	p_input_line++;
    212  1.1       cgd 	if (fgets(buf, sizeof buf, pfp) == Nullch) {
    213  1.1       cgd 	    if (first_command_line >= 0L) {
    214  1.1       cgd 					/* nothing but deletes!? */
    215  1.1       cgd 		p_start = first_command_line;
    216  1.1       cgd 		p_sline = fcl_line;
    217  1.1       cgd 		retval = ED_DIFF;
    218  1.1       cgd 		goto scan_exit;
    219  1.1       cgd 	    }
    220  1.1       cgd 	    else {
    221  1.1       cgd 		p_start = this_line;
    222  1.1       cgd 		p_sline = p_input_line;
    223  1.1       cgd 		retval = 0;
    224  1.1       cgd 		goto scan_exit;
    225  1.1       cgd 	    }
    226  1.1       cgd 	}
    227  1.1       cgd 	for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) {
    228  1.1       cgd 	    if (*s == '\t')
    229  1.1       cgd 		indent += 8 - (indent % 8);
    230  1.1       cgd 	    else
    231  1.1       cgd 		indent++;
    232  1.1       cgd 	}
    233  1.6  christos 	for (t=s; isdigit((unsigned char)*t) || *t == ','; t++) ;
    234  1.6  christos 	this_is_a_command = (isdigit((unsigned char)*s) &&
    235  1.1       cgd 	  (*t == 'd' || *t == 'c' || *t == 'a') );
    236  1.1       cgd 	if (first_command_line < 0L && this_is_a_command) {
    237  1.1       cgd 	    first_command_line = this_line;
    238  1.1       cgd 	    fcl_line = p_input_line;
    239  1.1       cgd 	    p_indent = indent;		/* assume this for now */
    240  1.1       cgd 	}
    241  1.1       cgd 	if (!stars_last_line && strnEQ(s, "*** ", 4))
    242  1.1       cgd 	    oldtmp = savestr(s+4);
    243  1.1       cgd 	else if (strnEQ(s, "--- ", 4))
    244  1.1       cgd 	    newtmp = savestr(s+4);
    245  1.1       cgd 	else if (strnEQ(s, "+++ ", 4))
    246  1.1       cgd 	    oldtmp = savestr(s+4);	/* pretend it is the old name */
    247  1.1       cgd 	else if (strnEQ(s, "Index:", 6))
    248  1.1       cgd 	    indtmp = savestr(s+6);
    249  1.1       cgd 	else if (strnEQ(s, "Prereq:", 7)) {
    250  1.6  christos 	    for (t=s+7; isspace((unsigned char)*t); t++) ;
    251  1.1       cgd 	    revision = savestr(t);
    252  1.6  christos 	    for (t=revision; *t && !isspace((unsigned char)*t); t++) ;
    253  1.1       cgd 	    *t = '\0';
    254  1.1       cgd 	    if (!*revision) {
    255  1.1       cgd 		free(revision);
    256  1.1       cgd 		revision = Nullch;
    257  1.1       cgd 	    }
    258  1.1       cgd 	}
    259  1.1       cgd 	if ((!diff_type || diff_type == ED_DIFF) &&
    260  1.1       cgd 	  first_command_line >= 0L &&
    261  1.1       cgd 	  strEQ(s, ".\n") ) {
    262  1.1       cgd 	    p_indent = indent;
    263  1.1       cgd 	    p_start = first_command_line;
    264  1.1       cgd 	    p_sline = fcl_line;
    265  1.1       cgd 	    retval = ED_DIFF;
    266  1.1       cgd 	    goto scan_exit;
    267  1.1       cgd 	}
    268  1.1       cgd 	if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) {
    269  1.1       cgd 	    if (!atol(s+3))
    270  1.1       cgd 		ok_to_create_file = TRUE;
    271  1.1       cgd 	    p_indent = indent;
    272  1.1       cgd 	    p_start = this_line;
    273  1.1       cgd 	    p_sline = p_input_line;
    274  1.1       cgd 	    retval = UNI_DIFF;
    275  1.1       cgd 	    goto scan_exit;
    276  1.1       cgd 	}
    277  1.1       cgd 	stars_this_line = strnEQ(s, "********", 8);
    278  1.1       cgd 	if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line &&
    279  1.1       cgd 		 strnEQ(s, "*** ", 4)) {
    280  1.1       cgd 	    if (!atol(s+4))
    281  1.1       cgd 		ok_to_create_file = TRUE;
    282  1.1       cgd 	    /* if this is a new context diff the character just before */
    283  1.1       cgd 	    /* the newline is a '*'. */
    284  1.1       cgd 	    while (*s != '\n')
    285  1.1       cgd 		s++;
    286  1.1       cgd 	    p_indent = indent;
    287  1.1       cgd 	    p_start = previous_line;
    288  1.1       cgd 	    p_sline = p_input_line - 1;
    289  1.1       cgd 	    retval = (*(s-1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF);
    290  1.1       cgd 	    goto scan_exit;
    291  1.1       cgd 	}
    292  1.1       cgd 	if ((!diff_type || diff_type == NORMAL_DIFF) &&
    293  1.1       cgd 	  last_line_was_command &&
    294  1.1       cgd 	  (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2)) ) {
    295  1.1       cgd 	    p_start = previous_line;
    296  1.1       cgd 	    p_sline = p_input_line - 1;
    297  1.1       cgd 	    p_indent = indent;
    298  1.1       cgd 	    retval = NORMAL_DIFF;
    299  1.1       cgd 	    goto scan_exit;
    300  1.1       cgd 	}
    301  1.1       cgd     }
    302  1.1       cgd   scan_exit:
    303  1.1       cgd     if (no_filearg) {
    304  1.1       cgd 	if (indtmp != Nullch)
    305  1.1       cgd 	    indname = fetchname(indtmp, strippath, ok_to_create_file);
    306  1.7  sommerfe 	if (oldtmp != Nullch) {
    307  1.1       cgd 	    oldname = fetchname(oldtmp, strippath, ok_to_create_file);
    308  1.7  sommerfe 	    old_file_is_dev_null = filename_is_dev_null;
    309  1.7  sommerfe 	}
    310  1.1       cgd 	if (newtmp != Nullch)
    311  1.1       cgd 	    newname = fetchname(newtmp, strippath, ok_to_create_file);
    312  1.1       cgd 	if (oldname && newname) {
    313  1.1       cgd 	    if (strlen(oldname) < strlen(newname))
    314  1.1       cgd 		filearg[0] = savestr(oldname);
    315  1.1       cgd 	    else
    316  1.1       cgd 		filearg[0] = savestr(newname);
    317  1.1       cgd 	}
    318  1.1       cgd 	else if (oldname)
    319  1.1       cgd 	    filearg[0] = savestr(oldname);
    320  1.1       cgd 	else if (newname)
    321  1.1       cgd 	    filearg[0] = savestr(newname);
    322  1.1       cgd 	else if (indname)
    323  1.1       cgd 	    filearg[0] = savestr(indname);
    324  1.1       cgd     }
    325  1.1       cgd     if (bestguess) {
    326  1.1       cgd 	free(bestguess);
    327  1.1       cgd 	bestguess = Nullch;
    328  1.1       cgd     }
    329  1.1       cgd     if (filearg[0] != Nullch)
    330  1.1       cgd 	bestguess = savestr(filearg[0]);
    331  1.1       cgd     else if (indtmp != Nullch)
    332  1.1       cgd 	bestguess = fetchname(indtmp, strippath, TRUE);
    333  1.1       cgd     else {
    334  1.7  sommerfe         if (oldtmp != Nullch) {
    335  1.1       cgd 	    oldname = fetchname(oldtmp, strippath, TRUE);
    336  1.7  sommerfe 	    old_file_is_dev_null = filename_is_dev_null;
    337  1.7  sommerfe 	}
    338  1.1       cgd 	if (newtmp != Nullch)
    339  1.1       cgd 	    newname = fetchname(newtmp, strippath, TRUE);
    340  1.1       cgd 	if (oldname && newname) {
    341  1.1       cgd 	    if (strlen(oldname) < strlen(newname))
    342  1.1       cgd 		bestguess = savestr(oldname);
    343  1.1       cgd 	    else
    344  1.1       cgd 		bestguess = savestr(newname);
    345  1.1       cgd 	}
    346  1.1       cgd 	else if (oldname)
    347  1.1       cgd 	    bestguess = savestr(oldname);
    348  1.1       cgd 	else if (newname)
    349  1.1       cgd 	    bestguess = savestr(newname);
    350  1.1       cgd     }
    351  1.1       cgd     if (indtmp != Nullch)
    352  1.1       cgd 	free(indtmp);
    353  1.1       cgd     if (oldtmp != Nullch)
    354  1.1       cgd 	free(oldtmp);
    355  1.1       cgd     if (newtmp != Nullch)
    356  1.1       cgd 	free(newtmp);
    357  1.1       cgd     if (indname != Nullch)
    358  1.1       cgd 	free(indname);
    359  1.1       cgd     if (oldname != Nullch)
    360  1.1       cgd 	free(oldname);
    361  1.1       cgd     if (newname != Nullch)
    362  1.1       cgd 	free(newname);
    363  1.1       cgd     return retval;
    364  1.1       cgd }
    365  1.1       cgd 
    366  1.1       cgd /* Remember where this patch ends so we know where to start up again. */
    367  1.1       cgd 
    368  1.1       cgd void
    369  1.8  kristerw next_intuit_at(long file_pos, long file_line)
    370  1.1       cgd {
    371  1.1       cgd     p_base = file_pos;
    372  1.1       cgd     p_bline = file_line;
    373  1.1       cgd }
    374  1.1       cgd 
    375  1.1       cgd /* Basically a verbose fseek() to the actual diff listing. */
    376  1.1       cgd 
    377  1.1       cgd void
    378  1.8  kristerw skip_to(long file_pos, long file_line)
    379  1.1       cgd {
    380  1.1       cgd     char *ret;
    381  1.1       cgd 
    382  1.1       cgd     assert(p_base <= file_pos);
    383  1.1       cgd     if (verbose && p_base < file_pos) {
    384  1.1       cgd 	Fseek(pfp, p_base, 0);
    385  1.1       cgd 	say1("The text leading up to this was:\n--------------------------\n");
    386  1.1       cgd 	while (ftell(pfp) < file_pos) {
    387  1.1       cgd 	    ret = fgets(buf, sizeof buf, pfp);
    388  1.1       cgd 	    assert(ret != Nullch);
    389  1.1       cgd 	    say2("|%s", buf);
    390  1.1       cgd 	}
    391  1.1       cgd 	say1("--------------------------\n");
    392  1.1       cgd     }
    393  1.1       cgd     else
    394  1.1       cgd 	Fseek(pfp, file_pos, 0);
    395  1.1       cgd     p_input_line = file_line - 1;
    396  1.1       cgd }
    397  1.1       cgd 
    398  1.1       cgd /* Make this a function for better debugging.  */
    399  1.1       cgd static void
    400  1.8  kristerw malformed(void)
    401  1.1       cgd {
    402  1.1       cgd     fatal3("malformed patch at line %ld: %s", p_input_line, buf);
    403  1.1       cgd 		/* about as informative as "Syntax error" in C */
    404  1.1       cgd }
    405  1.1       cgd 
    406  1.1       cgd /* True if there is more of the current diff listing to process. */
    407  1.1       cgd 
    408  1.1       cgd bool
    409  1.8  kristerw another_hunk(void)
    410  1.1       cgd {
    411  1.8  kristerw     char *s;
    412  1.8  kristerw     char *ret;
    413  1.8  kristerw     int context = 0;
    414  1.1       cgd 
    415  1.1       cgd     while (p_end >= 0) {
    416  1.1       cgd 	if (p_end == p_efake)
    417  1.1       cgd 	    p_end = p_bfake;		/* don't free twice */
    418  1.1       cgd 	else
    419  1.1       cgd 	    free(p_line[p_end]);
    420  1.1       cgd 	p_end--;
    421  1.1       cgd     }
    422  1.1       cgd     assert(p_end == -1);
    423  1.1       cgd     p_efake = -1;
    424  1.1       cgd 
    425  1.1       cgd     p_max = hunkmax;			/* gets reduced when --- found */
    426  1.1       cgd     if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) {
    427  1.1       cgd 	long line_beginning = ftell(pfp);
    428  1.1       cgd 					/* file pos of the current line */
    429  1.1       cgd 	LINENUM repl_beginning = 0;	/* index of --- line */
    430  1.8  kristerw 	LINENUM fillcnt = 0;		/* #lines of missing ptrn or repl */
    431  1.8  kristerw 	LINENUM fillsrc = 0;		/* index of first line to copy */
    432  1.8  kristerw 	LINENUM filldst = 0;		/* index of first missing line */
    433  1.1       cgd 	bool ptrn_spaces_eaten = FALSE;	/* ptrn was slightly misformed */
    434  1.8  kristerw 	bool repl_could_be_missing = TRUE;
    435  1.1       cgd 					/* no + or ! lines in this hunk */
    436  1.1       cgd 	bool repl_missing = FALSE;	/* we are now backtracking */
    437  1.1       cgd 	long repl_backtrack_position = 0;
    438  1.1       cgd 					/* file pos of first repl line */
    439  1.5  christos 	LINENUM repl_patch_line = 0;	/* input line number for same */
    440  1.8  kristerw 	LINENUM ptrn_copiable = 0;	/* # of copiable lines in ptrn */
    441  1.1       cgd 
    442  1.1       cgd 	ret = pgets(buf, sizeof buf, pfp);
    443  1.1       cgd 	p_input_line++;
    444  1.1       cgd 	if (ret == Nullch || strnNE(buf, "********", 8)) {
    445  1.1       cgd 	    next_intuit_at(line_beginning,p_input_line);
    446  1.1       cgd 	    return FALSE;
    447  1.1       cgd 	}
    448  1.1       cgd 	p_context = 100;
    449  1.1       cgd 	p_hunk_beg = p_input_line + 1;
    450  1.1       cgd 	while (p_end < p_max) {
    451  1.1       cgd 	    line_beginning = ftell(pfp);
    452  1.1       cgd 	    ret = pgets(buf, sizeof buf, pfp);
    453  1.1       cgd 	    p_input_line++;
    454  1.1       cgd 	    if (ret == Nullch) {
    455  1.1       cgd 		if (p_max - p_end < 4)
    456  1.1       cgd 		    Strcpy(buf, "  \n");  /* assume blank lines got chopped */
    457  1.1       cgd 		else {
    458  1.1       cgd 		    if (repl_beginning && repl_could_be_missing) {
    459  1.1       cgd 			repl_missing = TRUE;
    460  1.1       cgd 			goto hunk_done;
    461  1.1       cgd 		    }
    462  1.1       cgd 		    fatal1("unexpected end of file in patch\n");
    463  1.1       cgd 		}
    464  1.1       cgd 	    }
    465  1.1       cgd 	    p_end++;
    466  1.1       cgd 	    assert(p_end < hunkmax);
    467  1.1       cgd 	    p_char[p_end] = *buf;
    468  1.1       cgd #ifdef zilog
    469  1.1       cgd 	    p_line[(short)p_end] = Nullch;
    470  1.1       cgd #else
    471  1.1       cgd 	    p_line[p_end] = Nullch;
    472  1.1       cgd #endif
    473  1.1       cgd 	    switch (*buf) {
    474  1.1       cgd 	    case '*':
    475  1.1       cgd 		if (strnEQ(buf, "********", 8)) {
    476  1.1       cgd 		    if (repl_beginning && repl_could_be_missing) {
    477  1.1       cgd 			repl_missing = TRUE;
    478  1.1       cgd 			goto hunk_done;
    479  1.1       cgd 		    }
    480  1.1       cgd 		    else
    481  1.1       cgd 			fatal2("unexpected end of hunk at line %ld\n",
    482  1.1       cgd 			    p_input_line);
    483  1.1       cgd 		}
    484  1.1       cgd 		if (p_end != 0) {
    485  1.1       cgd 		    if (repl_beginning && repl_could_be_missing) {
    486  1.1       cgd 			repl_missing = TRUE;
    487  1.1       cgd 			goto hunk_done;
    488  1.1       cgd 		    }
    489  1.1       cgd 		    fatal3("unexpected *** at line %ld: %s", p_input_line, buf);
    490  1.1       cgd 		}
    491  1.1       cgd 		context = 0;
    492  1.1       cgd 		p_line[p_end] = savestr(buf);
    493  1.1       cgd 		if (out_of_mem) {
    494  1.1       cgd 		    p_end--;
    495  1.1       cgd 		    return FALSE;
    496  1.1       cgd 		}
    497  1.6  christos 		for (s=buf; *s && !isdigit((unsigned char)*s); s++) ;
    498  1.1       cgd 		if (!*s)
    499  1.1       cgd 		    malformed ();
    500  1.1       cgd 		if (strnEQ(s,"0,0",3))
    501  1.1       cgd 		    strcpy(s,s+2);
    502  1.1       cgd 		p_first = (LINENUM) atol(s);
    503  1.6  christos 		while (isdigit((unsigned char)*s)) s++;
    504  1.1       cgd 		if (*s == ',') {
    505  1.6  christos 		    for (; *s && !isdigit((unsigned char)*s); s++) ;
    506  1.1       cgd 		    if (!*s)
    507  1.1       cgd 			malformed ();
    508  1.1       cgd 		    p_ptrn_lines = ((LINENUM)atol(s)) - p_first + 1;
    509  1.1       cgd 		}
    510  1.1       cgd 		else if (p_first)
    511  1.1       cgd 		    p_ptrn_lines = 1;
    512  1.1       cgd 		else {
    513  1.1       cgd 		    p_ptrn_lines = 0;
    514  1.1       cgd 		    p_first = 1;
    515  1.1       cgd 		}
    516  1.1       cgd 		p_max = p_ptrn_lines + 6;	/* we need this much at least */
    517  1.1       cgd 		while (p_max >= hunkmax)
    518  1.1       cgd 		    grow_hunkmax();
    519  1.1       cgd 		p_max = hunkmax;
    520  1.1       cgd 		break;
    521  1.1       cgd 	    case '-':
    522  1.1       cgd 		if (buf[1] == '-') {
    523  1.1       cgd 		    if (repl_beginning ||
    524  1.1       cgd 			(p_end != p_ptrn_lines + 1 + (p_char[p_end-1] == '\n')))
    525  1.1       cgd 		    {
    526  1.1       cgd 			if (p_end == 1) {
    527  1.1       cgd 			    /* `old' lines were omitted - set up to fill */
    528  1.1       cgd 			    /* them in from 'new' context lines. */
    529  1.1       cgd 			    p_end = p_ptrn_lines + 1;
    530  1.1       cgd 			    fillsrc = p_end + 1;
    531  1.1       cgd 			    filldst = 1;
    532  1.1       cgd 			    fillcnt = p_ptrn_lines;
    533  1.1       cgd 			}
    534  1.1       cgd 			else {
    535  1.1       cgd 			    if (repl_beginning) {
    536  1.1       cgd 				if (repl_could_be_missing){
    537  1.1       cgd 				    repl_missing = TRUE;
    538  1.1       cgd 				    goto hunk_done;
    539  1.1       cgd 				}
    540  1.1       cgd 				fatal3(
    541  1.1       cgd "duplicate \"---\" at line %ld--check line numbers at line %ld\n",
    542  1.1       cgd 				    p_input_line, p_hunk_beg + repl_beginning);
    543  1.1       cgd 			    }
    544  1.1       cgd 			    else {
    545  1.1       cgd 				fatal4(
    546  1.1       cgd "%s \"---\" at line %ld--check line numbers at line %ld\n",
    547  1.1       cgd 				    (p_end <= p_ptrn_lines
    548  1.1       cgd 					? "Premature"
    549  1.1       cgd 					: "Overdue" ),
    550  1.1       cgd 				    p_input_line, p_hunk_beg);
    551  1.1       cgd 			    }
    552  1.1       cgd 			}
    553  1.1       cgd 		    }
    554  1.1       cgd 		    repl_beginning = p_end;
    555  1.1       cgd 		    repl_backtrack_position = ftell(pfp);
    556  1.1       cgd 		    repl_patch_line = p_input_line;
    557  1.1       cgd 		    p_line[p_end] = savestr(buf);
    558  1.1       cgd 		    if (out_of_mem) {
    559  1.1       cgd 			p_end--;
    560  1.1       cgd 			return FALSE;
    561  1.1       cgd 		    }
    562  1.1       cgd 		    p_char[p_end] = '=';
    563  1.6  christos 		    for (s=buf; *s && !isdigit((unsigned char)*s); s++) ;
    564  1.1       cgd 		    if (!*s)
    565  1.1       cgd 			malformed ();
    566  1.1       cgd 		    p_newfirst = (LINENUM) atol(s);
    567  1.6  christos 		    while (isdigit((unsigned char)*s)) s++;
    568  1.1       cgd 		    if (*s == ',') {
    569  1.6  christos 			for (; *s && !isdigit((unsigned char)*s); s++) ;
    570  1.1       cgd 			if (!*s)
    571  1.1       cgd 			    malformed ();
    572  1.1       cgd 			p_repl_lines = ((LINENUM)atol(s)) - p_newfirst + 1;
    573  1.1       cgd 		    }
    574  1.1       cgd 		    else if (p_newfirst)
    575  1.1       cgd 			p_repl_lines = 1;
    576  1.1       cgd 		    else {
    577  1.1       cgd 			p_repl_lines = 0;
    578  1.1       cgd 			p_newfirst = 1;
    579  1.1       cgd 		    }
    580  1.1       cgd 		    p_max = p_repl_lines + p_end;
    581  1.1       cgd 		    if (p_max > MAXHUNKSIZE)
    582  1.1       cgd 			fatal4("hunk too large (%ld lines) at line %ld: %s",
    583  1.1       cgd 			      p_max, p_input_line, buf);
    584  1.1       cgd 		    while (p_max >= hunkmax)
    585  1.1       cgd 			grow_hunkmax();
    586  1.1       cgd 		    if (p_repl_lines != ptrn_copiable
    587  1.1       cgd 		     && (p_context != 0 || p_repl_lines != 1))
    588  1.1       cgd 			repl_could_be_missing = FALSE;
    589  1.1       cgd 		    break;
    590  1.1       cgd 		}
    591  1.1       cgd 		goto change_line;
    592  1.1       cgd 	    case '+':  case '!':
    593  1.1       cgd 		repl_could_be_missing = FALSE;
    594  1.1       cgd 	      change_line:
    595  1.1       cgd 		if (buf[1] == '\n' && canonicalize)
    596  1.1       cgd 		    strcpy(buf+1," \n");
    597  1.6  christos 		if (!isspace((unsigned char)buf[1]) && buf[1] != '>' && buf[1] != '<' &&
    598  1.1       cgd 		  repl_beginning && repl_could_be_missing) {
    599  1.1       cgd 		    repl_missing = TRUE;
    600  1.1       cgd 		    goto hunk_done;
    601  1.1       cgd 		}
    602  1.1       cgd 		if (context >= 0) {
    603  1.1       cgd 		    if (context < p_context)
    604  1.1       cgd 			p_context = context;
    605  1.1       cgd 		    context = -1000;
    606  1.1       cgd 		}
    607  1.1       cgd 		p_line[p_end] = savestr(buf+2);
    608  1.1       cgd 		if (out_of_mem) {
    609  1.1       cgd 		    p_end--;
    610  1.1       cgd 		    return FALSE;
    611  1.1       cgd 		}
    612  1.1       cgd 		break;
    613  1.1       cgd 	    case '\t': case '\n':	/* assume the 2 spaces got eaten */
    614  1.1       cgd 		if (repl_beginning && repl_could_be_missing &&
    615  1.1       cgd 		  (!ptrn_spaces_eaten || diff_type == NEW_CONTEXT_DIFF) ) {
    616  1.1       cgd 		    repl_missing = TRUE;
    617  1.1       cgd 		    goto hunk_done;
    618  1.1       cgd 		}
    619  1.1       cgd 		p_line[p_end] = savestr(buf);
    620  1.1       cgd 		if (out_of_mem) {
    621  1.1       cgd 		    p_end--;
    622  1.1       cgd 		    return FALSE;
    623  1.1       cgd 		}
    624  1.1       cgd 		if (p_end != p_ptrn_lines + 1) {
    625  1.1       cgd 		    ptrn_spaces_eaten |= (repl_beginning != 0);
    626  1.1       cgd 		    context++;
    627  1.1       cgd 		    if (!repl_beginning)
    628  1.1       cgd 			ptrn_copiable++;
    629  1.1       cgd 		    p_char[p_end] = ' ';
    630  1.1       cgd 		}
    631  1.1       cgd 		break;
    632  1.1       cgd 	    case ' ':
    633  1.6  christos 		if (!isspace((unsigned char)buf[1]) &&
    634  1.1       cgd 		  repl_beginning && repl_could_be_missing) {
    635  1.1       cgd 		    repl_missing = TRUE;
    636  1.1       cgd 		    goto hunk_done;
    637  1.1       cgd 		}
    638  1.1       cgd 		context++;
    639  1.1       cgd 		if (!repl_beginning)
    640  1.1       cgd 		    ptrn_copiable++;
    641  1.1       cgd 		p_line[p_end] = savestr(buf+2);
    642  1.1       cgd 		if (out_of_mem) {
    643  1.1       cgd 		    p_end--;
    644  1.1       cgd 		    return FALSE;
    645  1.1       cgd 		}
    646  1.1       cgd 		break;
    647  1.1       cgd 	    default:
    648  1.1       cgd 		if (repl_beginning && repl_could_be_missing) {
    649  1.1       cgd 		    repl_missing = TRUE;
    650  1.1       cgd 		    goto hunk_done;
    651  1.1       cgd 		}
    652  1.1       cgd 		malformed ();
    653  1.1       cgd 	    }
    654  1.1       cgd 	    /* set up p_len for strncmp() so we don't have to */
    655  1.1       cgd 	    /* assume null termination */
    656  1.1       cgd 	    if (p_line[p_end])
    657  1.1       cgd 		p_len[p_end] = strlen(p_line[p_end]);
    658  1.1       cgd 	    else
    659  1.1       cgd 		p_len[p_end] = 0;
    660  1.1       cgd 	}
    661  1.1       cgd 
    662  1.1       cgd     hunk_done:
    663  1.1       cgd 	if (p_end >=0 && !repl_beginning)
    664  1.1       cgd 	    fatal2("no --- found in patch at line %ld\n", pch_hunk_beg());
    665  1.1       cgd 
    666  1.1       cgd 	if (repl_missing) {
    667  1.1       cgd 
    668  1.1       cgd 	    /* reset state back to just after --- */
    669  1.1       cgd 	    p_input_line = repl_patch_line;
    670  1.1       cgd 	    for (p_end--; p_end > repl_beginning; p_end--)
    671  1.1       cgd 		free(p_line[p_end]);
    672  1.1       cgd 	    Fseek(pfp, repl_backtrack_position, 0);
    673  1.1       cgd 
    674  1.1       cgd 	    /* redundant 'new' context lines were omitted - set */
    675  1.1       cgd 	    /* up to fill them in from the old file context */
    676  1.1       cgd 	    if (!p_context && p_repl_lines == 1) {
    677  1.1       cgd 		p_repl_lines = 0;
    678  1.1       cgd 		p_max--;
    679  1.1       cgd 	    }
    680  1.1       cgd 	    fillsrc = 1;
    681  1.1       cgd 	    filldst = repl_beginning+1;
    682  1.1       cgd 	    fillcnt = p_repl_lines;
    683  1.1       cgd 	    p_end = p_max;
    684  1.1       cgd 	}
    685  1.1       cgd 	else if (!p_context && fillcnt == 1) {
    686  1.1       cgd 	    /* the first hunk was a null hunk with no context */
    687  1.1       cgd 	    /* and we were expecting one line -- fix it up. */
    688  1.1       cgd 	    while (filldst < p_end) {
    689  1.1       cgd 		p_line[filldst] = p_line[filldst+1];
    690  1.1       cgd 		p_char[filldst] = p_char[filldst+1];
    691  1.1       cgd 		p_len[filldst] = p_len[filldst+1];
    692  1.1       cgd 		filldst++;
    693  1.1       cgd 	    }
    694  1.1       cgd #if 0
    695  1.1       cgd 	    repl_beginning--;		/* this doesn't need to be fixed */
    696  1.1       cgd #endif
    697  1.1       cgd 	    p_end--;
    698  1.1       cgd 	    p_first++;			/* do append rather than insert */
    699  1.1       cgd 	    fillcnt = 0;
    700  1.1       cgd 	    p_ptrn_lines = 0;
    701  1.1       cgd 	}
    702  1.1       cgd 
    703  1.1       cgd 	if (diff_type == CONTEXT_DIFF &&
    704  1.1       cgd 	  (fillcnt || (p_first > 1 && ptrn_copiable > 2*p_context)) ) {
    705  1.1       cgd 	    if (verbose)
    706  1.1       cgd 		say4("%s\n%s\n%s\n",
    707  1.1       cgd "(Fascinating--this is really a new-style context diff but without",
    708  1.1       cgd "the telltale extra asterisks on the *** line that usually indicate",
    709  1.1       cgd "the new style...)");
    710  1.1       cgd 	    diff_type = NEW_CONTEXT_DIFF;
    711  1.1       cgd 	}
    712  1.1       cgd 
    713  1.1       cgd 	/* if there were omitted context lines, fill them in now */
    714  1.1       cgd 	if (fillcnt) {
    715  1.1       cgd 	    p_bfake = filldst;		/* remember where not to free() */
    716  1.1       cgd 	    p_efake = filldst + fillcnt - 1;
    717  1.1       cgd 	    while (fillcnt-- > 0) {
    718  1.1       cgd 		while (fillsrc <= p_end && p_char[fillsrc] != ' ')
    719  1.1       cgd 		    fillsrc++;
    720  1.1       cgd 		if (fillsrc > p_end)
    721  1.1       cgd 		    fatal2("replacement text or line numbers mangled in hunk at line %ld\n",
    722  1.1       cgd 			p_hunk_beg);
    723  1.1       cgd 		p_line[filldst] = p_line[fillsrc];
    724  1.1       cgd 		p_char[filldst] = p_char[fillsrc];
    725  1.1       cgd 		p_len[filldst] = p_len[fillsrc];
    726  1.1       cgd 		fillsrc++; filldst++;
    727  1.1       cgd 	    }
    728  1.1       cgd 	    while (fillsrc <= p_end && fillsrc != repl_beginning &&
    729  1.1       cgd 	      p_char[fillsrc] != ' ')
    730  1.1       cgd 		fillsrc++;
    731  1.1       cgd #ifdef DEBUGGING
    732  1.1       cgd 	    if (debug & 64)
    733  1.1       cgd 		printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n",
    734  1.1       cgd 		    fillsrc,filldst,repl_beginning,p_end+1);
    735  1.1       cgd #endif
    736  1.1       cgd 	    assert(fillsrc==p_end+1 || fillsrc==repl_beginning);
    737  1.1       cgd 	    assert(filldst==p_end+1 || filldst==repl_beginning);
    738  1.1       cgd 	}
    739  1.1       cgd     }
    740  1.1       cgd     else if (diff_type == UNI_DIFF) {
    741  1.1       cgd 	long line_beginning = ftell(pfp);
    742  1.1       cgd 					/* file pos of the current line */
    743  1.8  kristerw 	LINENUM fillsrc;		/* index of old lines */
    744  1.8  kristerw 	LINENUM filldst;		/* index of new lines */
    745  1.1       cgd 	char ch;
    746  1.1       cgd 
    747  1.1       cgd 	ret = pgets(buf, sizeof buf, pfp);
    748  1.1       cgd 	p_input_line++;
    749  1.1       cgd 	if (ret == Nullch || strnNE(buf, "@@ -", 4)) {
    750  1.1       cgd 	    next_intuit_at(line_beginning,p_input_line);
    751  1.1       cgd 	    return FALSE;
    752  1.1       cgd 	}
    753  1.1       cgd 	s = buf+4;
    754  1.1       cgd 	if (!*s)
    755  1.1       cgd 	    malformed ();
    756  1.1       cgd 	p_first = (LINENUM) atol(s);
    757  1.6  christos 	while (isdigit((unsigned char)*s)) s++;
    758  1.1       cgd 	if (*s == ',') {
    759  1.1       cgd 	    p_ptrn_lines = (LINENUM) atol(++s);
    760  1.6  christos 	    while (isdigit((unsigned char)*s)) s++;
    761  1.1       cgd 	} else
    762  1.1       cgd 	    p_ptrn_lines = 1;
    763  1.1       cgd 	if (*s == ' ') s++;
    764  1.1       cgd 	if (*s != '+' || !*++s)
    765  1.1       cgd 	    malformed ();
    766  1.1       cgd 	p_newfirst = (LINENUM) atol(s);
    767  1.6  christos 	while (isdigit((unsigned char)*s)) s++;
    768  1.1       cgd 	if (*s == ',') {
    769  1.1       cgd 	    p_repl_lines = (LINENUM) atol(++s);
    770  1.6  christos 	    while (isdigit((unsigned char)*s)) s++;
    771  1.1       cgd 	} else
    772  1.1       cgd 	    p_repl_lines = 1;
    773  1.1       cgd 	if (*s == ' ') s++;
    774  1.1       cgd 	if (*s != '@')
    775  1.1       cgd 	    malformed ();
    776  1.1       cgd 	if (!p_ptrn_lines)
    777  1.1       cgd 	    p_first++;			/* do append rather than insert */
    778  1.1       cgd 	p_max = p_ptrn_lines + p_repl_lines + 1;
    779  1.1       cgd 	while (p_max >= hunkmax)
    780  1.1       cgd 	    grow_hunkmax();
    781  1.1       cgd 	fillsrc = 1;
    782  1.1       cgd 	filldst = fillsrc + p_ptrn_lines;
    783  1.1       cgd 	p_end = filldst + p_repl_lines;
    784  1.1       cgd 	Sprintf(buf,"*** %ld,%ld ****\n",p_first,p_first + p_ptrn_lines - 1);
    785  1.1       cgd 	p_line[0] = savestr(buf);
    786  1.1       cgd 	if (out_of_mem) {
    787  1.1       cgd 	    p_end = -1;
    788  1.1       cgd 	    return FALSE;
    789  1.1       cgd 	}
    790  1.1       cgd 	p_char[0] = '*';
    791  1.1       cgd         Sprintf(buf,"--- %ld,%ld ----\n",p_newfirst,p_newfirst+p_repl_lines-1);
    792  1.1       cgd 	p_line[filldst] = savestr(buf);
    793  1.1       cgd 	if (out_of_mem) {
    794  1.1       cgd 	    p_end = 0;
    795  1.1       cgd 	    return FALSE;
    796  1.1       cgd 	}
    797  1.1       cgd 	p_char[filldst++] = '=';
    798  1.1       cgd 	p_context = 100;
    799  1.1       cgd 	context = 0;
    800  1.1       cgd 	p_hunk_beg = p_input_line + 1;
    801  1.1       cgd 	while (fillsrc <= p_ptrn_lines || filldst <= p_end) {
    802  1.1       cgd 	    line_beginning = ftell(pfp);
    803  1.1       cgd 	    ret = pgets(buf, sizeof buf, pfp);
    804  1.1       cgd 	    p_input_line++;
    805  1.1       cgd 	    if (ret == Nullch) {
    806  1.1       cgd 		if (p_max - filldst < 3)
    807  1.1       cgd 		    Strcpy(buf, " \n");  /* assume blank lines got chopped */
    808  1.1       cgd 		else {
    809  1.1       cgd 		    fatal1("unexpected end of file in patch\n");
    810  1.1       cgd 		}
    811  1.1       cgd 	    }
    812  1.1       cgd 	    if (*buf == '\t' || *buf == '\n') {
    813  1.1       cgd 		ch = ' ';		/* assume the space got eaten */
    814  1.1       cgd 		s = savestr(buf);
    815  1.1       cgd 	    }
    816  1.1       cgd 	    else {
    817  1.1       cgd 		ch = *buf;
    818  1.1       cgd 		s = savestr(buf+1);
    819  1.1       cgd 	    }
    820  1.1       cgd 	    if (out_of_mem) {
    821  1.1       cgd 		while (--filldst > p_ptrn_lines)
    822  1.1       cgd 		    free(p_line[filldst]);
    823  1.1       cgd 		p_end = fillsrc-1;
    824  1.1       cgd 		return FALSE;
    825  1.1       cgd 	    }
    826  1.1       cgd 	    switch (ch) {
    827  1.1       cgd 	    case '-':
    828  1.1       cgd 		if (fillsrc > p_ptrn_lines) {
    829  1.1       cgd 		    free(s);
    830  1.1       cgd 		    p_end = filldst-1;
    831  1.1       cgd 		    malformed ();
    832  1.1       cgd 		}
    833  1.1       cgd 		p_char[fillsrc] = ch;
    834  1.1       cgd 		p_line[fillsrc] = s;
    835  1.1       cgd 		p_len[fillsrc++] = strlen(s);
    836  1.1       cgd 		break;
    837  1.1       cgd 	    case '=':
    838  1.1       cgd 		ch = ' ';
    839  1.1       cgd 		/* FALL THROUGH */
    840  1.1       cgd 	    case ' ':
    841  1.1       cgd 		if (fillsrc > p_ptrn_lines) {
    842  1.1       cgd 		    free(s);
    843  1.1       cgd 		    while (--filldst > p_ptrn_lines)
    844  1.1       cgd 			free(p_line[filldst]);
    845  1.1       cgd 		    p_end = fillsrc-1;
    846  1.1       cgd 		    malformed ();
    847  1.1       cgd 		}
    848  1.1       cgd 		context++;
    849  1.1       cgd 		p_char[fillsrc] = ch;
    850  1.1       cgd 		p_line[fillsrc] = s;
    851  1.1       cgd 		p_len[fillsrc++] = strlen(s);
    852  1.1       cgd 		s = savestr(s);
    853  1.1       cgd 		if (out_of_mem) {
    854  1.1       cgd 		    while (--filldst > p_ptrn_lines)
    855  1.1       cgd 			free(p_line[filldst]);
    856  1.1       cgd 		    p_end = fillsrc-1;
    857  1.1       cgd 		    return FALSE;
    858  1.1       cgd 		}
    859  1.1       cgd 		/* FALL THROUGH */
    860  1.1       cgd 	    case '+':
    861  1.1       cgd 		if (filldst > p_end) {
    862  1.1       cgd 		    free(s);
    863  1.1       cgd 		    while (--filldst > p_ptrn_lines)
    864  1.1       cgd 			free(p_line[filldst]);
    865  1.1       cgd 		    p_end = fillsrc-1;
    866  1.1       cgd 		    malformed ();
    867  1.1       cgd 		}
    868  1.1       cgd 		p_char[filldst] = ch;
    869  1.1       cgd 		p_line[filldst] = s;
    870  1.1       cgd 		p_len[filldst++] = strlen(s);
    871  1.1       cgd 		break;
    872  1.1       cgd 	    default:
    873  1.1       cgd 		p_end = filldst;
    874  1.1       cgd 		malformed ();
    875  1.1       cgd 	    }
    876  1.1       cgd 	    if (ch != ' ' && context > 0) {
    877  1.1       cgd 		if (context < p_context)
    878  1.1       cgd 		    p_context = context;
    879  1.1       cgd 		context = -1000;
    880  1.1       cgd 	    }
    881  1.1       cgd 	}/* while */
    882  1.1       cgd     }
    883  1.1       cgd     else {				/* normal diff--fake it up */
    884  1.1       cgd 	char hunk_type;
    885  1.8  kristerw 	int i;
    886  1.1       cgd 	LINENUM min, max;
    887  1.1       cgd 	long line_beginning = ftell(pfp);
    888  1.1       cgd 
    889  1.1       cgd 	p_context = 0;
    890  1.1       cgd 	ret = pgets(buf, sizeof buf, pfp);
    891  1.1       cgd 	p_input_line++;
    892  1.6  christos 	if (ret == Nullch || !isdigit((unsigned char)*buf)) {
    893  1.1       cgd 	    next_intuit_at(line_beginning,p_input_line);
    894  1.1       cgd 	    return FALSE;
    895  1.1       cgd 	}
    896  1.1       cgd 	p_first = (LINENUM)atol(buf);
    897  1.6  christos 	for (s=buf; isdigit((unsigned char)*s); s++) ;
    898  1.1       cgd 	if (*s == ',') {
    899  1.1       cgd 	    p_ptrn_lines = (LINENUM)atol(++s) - p_first + 1;
    900  1.6  christos 	    while (isdigit((unsigned char)*s)) s++;
    901  1.1       cgd 	}
    902  1.1       cgd 	else
    903  1.1       cgd 	    p_ptrn_lines = (*s != 'a');
    904  1.1       cgd 	hunk_type = *s;
    905  1.1       cgd 	if (hunk_type == 'a')
    906  1.1       cgd 	    p_first++;			/* do append rather than insert */
    907  1.1       cgd 	min = (LINENUM)atol(++s);
    908  1.6  christos 	for (; isdigit((unsigned char)*s); s++) ;
    909  1.1       cgd 	if (*s == ',')
    910  1.1       cgd 	    max = (LINENUM)atol(++s);
    911  1.1       cgd 	else
    912  1.1       cgd 	    max = min;
    913  1.1       cgd 	if (hunk_type == 'd')
    914  1.1       cgd 	    min++;
    915  1.1       cgd 	p_end = p_ptrn_lines + 1 + max - min + 1;
    916  1.1       cgd 	if (p_end > MAXHUNKSIZE)
    917  1.1       cgd 	    fatal4("hunk too large (%ld lines) at line %ld: %s",
    918  1.1       cgd 		  p_end, p_input_line, buf);
    919  1.1       cgd 	while (p_end >= hunkmax)
    920  1.1       cgd 	    grow_hunkmax();
    921  1.1       cgd 	p_newfirst = min;
    922  1.1       cgd 	p_repl_lines = max - min + 1;
    923  1.1       cgd 	Sprintf(buf, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1);
    924  1.1       cgd 	p_line[0] = savestr(buf);
    925  1.1       cgd 	if (out_of_mem) {
    926  1.1       cgd 	    p_end = -1;
    927  1.1       cgd 	    return FALSE;
    928  1.1       cgd 	}
    929  1.1       cgd 	p_char[0] = '*';
    930  1.1       cgd 	for (i=1; i<=p_ptrn_lines; i++) {
    931  1.1       cgd 	    ret = pgets(buf, sizeof buf, pfp);
    932  1.1       cgd 	    p_input_line++;
    933  1.1       cgd 	    if (ret == Nullch)
    934  1.1       cgd 		fatal2("unexpected end of file in patch at line %ld\n",
    935  1.1       cgd 		  p_input_line);
    936  1.1       cgd 	    if (*buf != '<')
    937  1.1       cgd 		fatal2("< expected at line %ld of patch\n", p_input_line);
    938  1.1       cgd 	    p_line[i] = savestr(buf+2);
    939  1.1       cgd 	    if (out_of_mem) {
    940  1.1       cgd 		p_end = i-1;
    941  1.1       cgd 		return FALSE;
    942  1.1       cgd 	    }
    943  1.1       cgd 	    p_len[i] = strlen(p_line[i]);
    944  1.1       cgd 	    p_char[i] = '-';
    945  1.1       cgd 	}
    946  1.1       cgd 	if (hunk_type == 'c') {
    947  1.1       cgd 	    ret = pgets(buf, sizeof buf, pfp);
    948  1.1       cgd 	    p_input_line++;
    949  1.1       cgd 	    if (ret == Nullch)
    950  1.1       cgd 		fatal2("unexpected end of file in patch at line %ld\n",
    951  1.1       cgd 		    p_input_line);
    952  1.1       cgd 	    if (*buf != '-')
    953  1.1       cgd 		fatal2("--- expected at line %ld of patch\n", p_input_line);
    954  1.1       cgd 	}
    955  1.1       cgd 	Sprintf(buf, "--- %ld,%ld\n", min, max);
    956  1.1       cgd 	p_line[i] = savestr(buf);
    957  1.1       cgd 	if (out_of_mem) {
    958  1.1       cgd 	    p_end = i-1;
    959  1.1       cgd 	    return FALSE;
    960  1.1       cgd 	}
    961  1.1       cgd 	p_char[i] = '=';
    962  1.1       cgd 	for (i++; i<=p_end; i++) {
    963  1.1       cgd 	    ret = pgets(buf, sizeof buf, pfp);
    964  1.1       cgd 	    p_input_line++;
    965  1.1       cgd 	    if (ret == Nullch)
    966  1.1       cgd 		fatal2("unexpected end of file in patch at line %ld\n",
    967  1.1       cgd 		    p_input_line);
    968  1.1       cgd 	    if (*buf != '>')
    969  1.1       cgd 		fatal2("> expected at line %ld of patch\n", p_input_line);
    970  1.1       cgd 	    p_line[i] = savestr(buf+2);
    971  1.1       cgd 	    if (out_of_mem) {
    972  1.1       cgd 		p_end = i-1;
    973  1.1       cgd 		return FALSE;
    974  1.1       cgd 	    }
    975  1.1       cgd 	    p_len[i] = strlen(p_line[i]);
    976  1.1       cgd 	    p_char[i] = '+';
    977  1.1       cgd 	}
    978  1.1       cgd     }
    979  1.1       cgd     if (reverse)			/* backwards patch? */
    980  1.1       cgd 	if (!pch_swap())
    981  1.1       cgd 	    say1("Not enough memory to swap next hunk!\n");
    982  1.1       cgd #ifdef DEBUGGING
    983  1.1       cgd     if (debug & 2) {
    984  1.1       cgd 	int i;
    985  1.1       cgd 	char special;
    986  1.1       cgd 
    987  1.1       cgd 	for (i=0; i <= p_end; i++) {
    988  1.1       cgd 	    if (i == p_ptrn_lines)
    989  1.1       cgd 		special = '^';
    990  1.1       cgd 	    else
    991  1.1       cgd 		special = ' ';
    992  1.1       cgd 	    fprintf(stderr, "%3d %c %c %s", i, p_char[i], special, p_line[i]);
    993  1.1       cgd 	    Fflush(stderr);
    994  1.1       cgd 	}
    995  1.1       cgd     }
    996  1.1       cgd #endif
    997  1.1       cgd     if (p_end+1 < hunkmax)	/* paranoia reigns supreme... */
    998  1.1       cgd 	p_char[p_end+1] = '^';  /* add a stopper for apply_hunk */
    999  1.1       cgd     return TRUE;
   1000  1.1       cgd }
   1001  1.1       cgd 
   1002  1.1       cgd /* Input a line from the patch file, worrying about indentation. */
   1003  1.1       cgd 
   1004  1.1       cgd char *
   1005  1.8  kristerw pgets(char *bf, int sz, FILE *fp)
   1006  1.1       cgd {
   1007  1.1       cgd     char *ret = fgets(bf, sz, fp);
   1008  1.8  kristerw     char *s;
   1009  1.8  kristerw     int indent = 0;
   1010  1.1       cgd 
   1011  1.1       cgd     if (p_indent && ret != Nullch) {
   1012  1.1       cgd 	for (s=buf;
   1013  1.1       cgd 	  indent < p_indent && (*s == ' ' || *s == '\t' || *s == 'X'); s++) {
   1014  1.1       cgd 	    if (*s == '\t')
   1015  1.1       cgd 		indent += 8 - (indent % 7);
   1016  1.1       cgd 	    else
   1017  1.1       cgd 		indent++;
   1018  1.1       cgd 	}
   1019  1.1       cgd 	if (buf != s)
   1020  1.1       cgd 	    Strcpy(buf, s);
   1021  1.1       cgd     }
   1022  1.1       cgd     return ret;
   1023  1.1       cgd }
   1024  1.1       cgd 
   1025  1.1       cgd /* Reverse the old and new portions of the current hunk. */
   1026  1.1       cgd 
   1027  1.1       cgd bool
   1028  1.8  kristerw pch_swap(void)
   1029  1.1       cgd {
   1030  1.1       cgd     char **tp_line;		/* the text of the hunk */
   1031  1.1       cgd     short *tp_len;		/* length of each line */
   1032  1.1       cgd     char *tp_char;		/* +, -, and ! */
   1033  1.8  kristerw     LINENUM i;
   1034  1.8  kristerw     LINENUM n;
   1035  1.1       cgd     bool blankline = FALSE;
   1036  1.8  kristerw     char *s;
   1037  1.1       cgd 
   1038  1.1       cgd     i = p_first;
   1039  1.1       cgd     p_first = p_newfirst;
   1040  1.1       cgd     p_newfirst = i;
   1041  1.1       cgd 
   1042  1.1       cgd     /* make a scratch copy */
   1043  1.1       cgd 
   1044  1.1       cgd     tp_line = p_line;
   1045  1.1       cgd     tp_len = p_len;
   1046  1.1       cgd     tp_char = p_char;
   1047  1.1       cgd     p_line = Null(char**);	/* force set_hunkmax to allocate again */
   1048  1.1       cgd     p_len = Null(short*);
   1049  1.1       cgd     p_char = Nullch;
   1050  1.1       cgd     set_hunkmax();
   1051  1.1       cgd     if (p_line == Null(char**) || p_len == Null(short*) || p_char == Nullch) {
   1052  1.1       cgd 	if (p_line == Null(char**))
   1053  1.8  kristerw 	    free(p_line);
   1054  1.1       cgd 	p_line = tp_line;
   1055  1.1       cgd 	if (p_len == Null(short*))
   1056  1.8  kristerw 	    free(p_len);
   1057  1.1       cgd 	p_len = tp_len;
   1058  1.1       cgd 	if (p_char == Nullch)
   1059  1.8  kristerw 	    free(p_char);
   1060  1.1       cgd 	p_char = tp_char;
   1061  1.1       cgd 	return FALSE;		/* not enough memory to swap hunk! */
   1062  1.1       cgd     }
   1063  1.1       cgd 
   1064  1.1       cgd     /* now turn the new into the old */
   1065  1.1       cgd 
   1066  1.1       cgd     i = p_ptrn_lines + 1;
   1067  1.1       cgd     if (tp_char[i] == '\n') {		/* account for possible blank line */
   1068  1.1       cgd 	blankline = TRUE;
   1069  1.1       cgd 	i++;
   1070  1.1       cgd     }
   1071  1.1       cgd     if (p_efake >= 0) {			/* fix non-freeable ptr range */
   1072  1.1       cgd 	if (p_efake <= i)
   1073  1.1       cgd 	    n = p_end - i + 1;
   1074  1.1       cgd 	else
   1075  1.1       cgd 	    n = -i;
   1076  1.1       cgd 	p_efake += n;
   1077  1.1       cgd 	p_bfake += n;
   1078  1.1       cgd     }
   1079  1.1       cgd     for (n=0; i <= p_end; i++,n++) {
   1080  1.1       cgd 	p_line[n] = tp_line[i];
   1081  1.1       cgd 	p_char[n] = tp_char[i];
   1082  1.1       cgd 	if (p_char[n] == '+')
   1083  1.1       cgd 	    p_char[n] = '-';
   1084  1.1       cgd 	p_len[n] = tp_len[i];
   1085  1.1       cgd     }
   1086  1.1       cgd     if (blankline) {
   1087  1.1       cgd 	i = p_ptrn_lines + 1;
   1088  1.1       cgd 	p_line[n] = tp_line[i];
   1089  1.1       cgd 	p_char[n] = tp_char[i];
   1090  1.1       cgd 	p_len[n] = tp_len[i];
   1091  1.1       cgd 	n++;
   1092  1.1       cgd     }
   1093  1.1       cgd     assert(p_char[0] == '=');
   1094  1.1       cgd     p_char[0] = '*';
   1095  1.1       cgd     for (s=p_line[0]; *s; s++)
   1096  1.1       cgd 	if (*s == '-')
   1097  1.1       cgd 	    *s = '*';
   1098  1.1       cgd 
   1099  1.1       cgd     /* now turn the old into the new */
   1100  1.1       cgd 
   1101  1.1       cgd     assert(tp_char[0] == '*');
   1102  1.1       cgd     tp_char[0] = '=';
   1103  1.1       cgd     for (s=tp_line[0]; *s; s++)
   1104  1.1       cgd 	if (*s == '*')
   1105  1.1       cgd 	    *s = '-';
   1106  1.1       cgd     for (i=0; n <= p_end; i++,n++) {
   1107  1.1       cgd 	p_line[n] = tp_line[i];
   1108  1.1       cgd 	p_char[n] = tp_char[i];
   1109  1.1       cgd 	if (p_char[n] == '-')
   1110  1.1       cgd 	    p_char[n] = '+';
   1111  1.1       cgd 	p_len[n] = tp_len[i];
   1112  1.1       cgd     }
   1113  1.1       cgd     assert(i == p_ptrn_lines + 1);
   1114  1.1       cgd     i = p_ptrn_lines;
   1115  1.1       cgd     p_ptrn_lines = p_repl_lines;
   1116  1.1       cgd     p_repl_lines = i;
   1117  1.1       cgd     if (tp_line == Null(char**))
   1118  1.8  kristerw 	free(tp_line);
   1119  1.1       cgd     if (tp_len == Null(short*))
   1120  1.8  kristerw 	free(tp_len);
   1121  1.1       cgd     if (tp_char == Nullch)
   1122  1.8  kristerw 	free(tp_char);
   1123  1.1       cgd     return TRUE;
   1124  1.1       cgd }
   1125  1.1       cgd 
   1126  1.1       cgd /* Return the specified line position in the old file of the old context. */
   1127  1.1       cgd 
   1128  1.1       cgd LINENUM
   1129  1.8  kristerw pch_first(void)
   1130  1.1       cgd {
   1131  1.1       cgd     return p_first;
   1132  1.1       cgd }
   1133  1.1       cgd 
   1134  1.1       cgd /* Return the number of lines of old context. */
   1135  1.1       cgd 
   1136  1.1       cgd LINENUM
   1137  1.8  kristerw pch_ptrn_lines(void)
   1138  1.1       cgd {
   1139  1.1       cgd     return p_ptrn_lines;
   1140  1.1       cgd }
   1141  1.1       cgd 
   1142  1.1       cgd /* Return the probable line position in the new file of the first line. */
   1143  1.1       cgd 
   1144  1.1       cgd LINENUM
   1145  1.8  kristerw pch_newfirst(void)
   1146  1.1       cgd {
   1147  1.1       cgd     return p_newfirst;
   1148  1.1       cgd }
   1149  1.1       cgd 
   1150  1.1       cgd /* Return the number of lines in the replacement text including context. */
   1151  1.1       cgd 
   1152  1.1       cgd LINENUM
   1153  1.8  kristerw pch_repl_lines(void)
   1154  1.1       cgd {
   1155  1.1       cgd     return p_repl_lines;
   1156  1.1       cgd }
   1157  1.1       cgd 
   1158  1.1       cgd /* Return the number of lines in the whole hunk. */
   1159  1.1       cgd 
   1160  1.1       cgd LINENUM
   1161  1.8  kristerw pch_end(void)
   1162  1.1       cgd {
   1163  1.1       cgd     return p_end;
   1164  1.1       cgd }
   1165  1.1       cgd 
   1166  1.1       cgd /* Return the number of context lines before the first changed line. */
   1167  1.1       cgd 
   1168  1.1       cgd LINENUM
   1169  1.8  kristerw pch_context(void)
   1170  1.1       cgd {
   1171  1.1       cgd     return p_context;
   1172  1.1       cgd }
   1173  1.1       cgd 
   1174  1.1       cgd /* Return the length of a particular patch line. */
   1175  1.1       cgd 
   1176  1.1       cgd short
   1177  1.8  kristerw pch_line_len(LINENUM line)
   1178  1.1       cgd {
   1179  1.1       cgd     return p_len[line];
   1180  1.1       cgd }
   1181  1.1       cgd 
   1182  1.1       cgd /* Return the control character (+, -, *, !, etc) for a patch line. */
   1183  1.1       cgd 
   1184  1.1       cgd char
   1185  1.8  kristerw pch_char(LINENUM line)
   1186  1.1       cgd {
   1187  1.1       cgd     return p_char[line];
   1188  1.1       cgd }
   1189  1.1       cgd 
   1190  1.1       cgd /* Return a pointer to a particular patch line. */
   1191  1.1       cgd 
   1192  1.1       cgd char *
   1193  1.8  kristerw pfetch(LINENUM line)
   1194  1.1       cgd {
   1195  1.1       cgd     return p_line[line];
   1196  1.1       cgd }
   1197  1.1       cgd 
   1198  1.1       cgd /* Return where in the patch file this hunk began, for error messages. */
   1199  1.1       cgd 
   1200  1.1       cgd LINENUM
   1201  1.8  kristerw pch_hunk_beg(void)
   1202  1.1       cgd {
   1203  1.1       cgd     return p_hunk_beg;
   1204  1.1       cgd }
   1205  1.1       cgd 
   1206  1.1       cgd /* Apply an ed script by feeding ed itself. */
   1207  1.1       cgd 
   1208  1.1       cgd void
   1209  1.8  kristerw do_ed_script(void)
   1210  1.1       cgd {
   1211  1.8  kristerw     char *t;
   1212  1.8  kristerw     long beginning_of_this_line;
   1213  1.8  kristerw     bool this_line_is_command = FALSE;
   1214  1.8  kristerw     FILE *pipefp = NULL;
   1215  1.1       cgd 
   1216  1.1       cgd     if (!skip_rest_of_patch) {
   1217  1.1       cgd 	Unlink(TMPOUTNAME);
   1218  1.1       cgd 	copy_file(filearg[0], TMPOUTNAME);
   1219  1.1       cgd 	if (verbose)
   1220  1.1       cgd 	    Sprintf(buf, "/bin/ed %s", TMPOUTNAME);
   1221  1.1       cgd 	else
   1222  1.1       cgd 	    Sprintf(buf, "/bin/ed - %s", TMPOUTNAME);
   1223  1.1       cgd 	pipefp = popen(buf, "w");
   1224  1.1       cgd     }
   1225  1.1       cgd     for (;;) {
   1226  1.1       cgd 	beginning_of_this_line = ftell(pfp);
   1227  1.1       cgd 	if (pgets(buf, sizeof buf, pfp) == Nullch) {
   1228  1.1       cgd 	    next_intuit_at(beginning_of_this_line,p_input_line);
   1229  1.1       cgd 	    break;
   1230  1.1       cgd 	}
   1231  1.1       cgd 	p_input_line++;
   1232  1.6  christos 	for (t=buf; isdigit((unsigned char)*t) || *t == ','; t++) ;
   1233  1.6  christos 	this_line_is_command = (isdigit((unsigned char)*buf) &&
   1234  1.1       cgd 	  (*t == 'd' || *t == 'c' || *t == 'a') );
   1235  1.1       cgd 	if (this_line_is_command) {
   1236  1.1       cgd 	    if (!skip_rest_of_patch)
   1237  1.1       cgd 		fputs(buf, pipefp);
   1238  1.1       cgd 	    if (*t != 'd') {
   1239  1.1       cgd 		while (pgets(buf, sizeof buf, pfp) != Nullch) {
   1240  1.1       cgd 		    p_input_line++;
   1241  1.1       cgd 		    if (!skip_rest_of_patch)
   1242  1.1       cgd 			fputs(buf, pipefp);
   1243  1.1       cgd 		    if (strEQ(buf, ".\n"))
   1244  1.1       cgd 			break;
   1245  1.1       cgd 		}
   1246  1.1       cgd 	    }
   1247  1.1       cgd 	}
   1248  1.1       cgd 	else {
   1249  1.1       cgd 	    next_intuit_at(beginning_of_this_line,p_input_line);
   1250  1.1       cgd 	    break;
   1251  1.1       cgd 	}
   1252  1.1       cgd     }
   1253  1.1       cgd     if (skip_rest_of_patch)
   1254  1.1       cgd 	return;
   1255  1.1       cgd     fprintf(pipefp, "w\n");
   1256  1.1       cgd     fprintf(pipefp, "q\n");
   1257  1.1       cgd     Fflush(pipefp);
   1258  1.1       cgd     Pclose(pipefp);
   1259  1.1       cgd     ignore_signals();
   1260  1.1       cgd     if (move_file(TMPOUTNAME, outname) < 0) {
   1261  1.1       cgd 	toutkeep = TRUE;
   1262  1.1       cgd 	chmod(TMPOUTNAME, filemode);
   1263  1.1       cgd     }
   1264  1.1       cgd     else
   1265  1.1       cgd 	chmod(outname, filemode);
   1266  1.1       cgd     set_signals(1);
   1267  1.1       cgd }
   1268