1*0b459c2cSDavid du Colombier /* reading patches */
2*0b459c2cSDavid du Colombier
3*0b459c2cSDavid du Colombier /* $Id: pch.c,v 1.26 1997/07/21 17:59:46 eggert Exp $ */
4*0b459c2cSDavid du Colombier
5*0b459c2cSDavid du Colombier /*
6*0b459c2cSDavid du Colombier Copyright 1986, 1987, 1988 Larry Wall
7*0b459c2cSDavid du Colombier Copyright 1990, 1991, 1992, 1993, 1997 Free Software Foundation, Inc.
8*0b459c2cSDavid du Colombier
9*0b459c2cSDavid du Colombier This program is free software; you can redistribute it and/or modify
10*0b459c2cSDavid du Colombier it under the terms of the GNU General Public License as published by
11*0b459c2cSDavid du Colombier the Free Software Foundation; either version 2, or (at your option)
12*0b459c2cSDavid du Colombier any later version.
13*0b459c2cSDavid du Colombier
14*0b459c2cSDavid du Colombier This program is distributed in the hope that it will be useful,
15*0b459c2cSDavid du Colombier but WITHOUT ANY WARRANTY; without even the implied warranty of
16*0b459c2cSDavid du Colombier MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17*0b459c2cSDavid du Colombier GNU General Public License for more details.
18*0b459c2cSDavid du Colombier
19*0b459c2cSDavid du Colombier You should have received a copy of the GNU General Public License
20*0b459c2cSDavid du Colombier along with this program; see the file COPYING.
21*0b459c2cSDavid du Colombier If not, write to the Free Software Foundation,
22*0b459c2cSDavid du Colombier 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
23*0b459c2cSDavid du Colombier */
24*0b459c2cSDavid du Colombier
25*0b459c2cSDavid du Colombier #define XTERN extern
26*0b459c2cSDavid du Colombier #include <common.h>
27*0b459c2cSDavid du Colombier #include <backupfile.h>
28*0b459c2cSDavid du Colombier #include <inp.h>
29*0b459c2cSDavid du Colombier #include <util.h>
30*0b459c2cSDavid du Colombier #undef XTERN
31*0b459c2cSDavid du Colombier #define XTERN
32*0b459c2cSDavid du Colombier #include <pch.h>
33*0b459c2cSDavid du Colombier
34*0b459c2cSDavid du Colombier #define INITHUNKMAX 125 /* initial dynamic allocation size */
35*0b459c2cSDavid du Colombier
36*0b459c2cSDavid du Colombier /* Patch (diff listing) abstract type. */
37*0b459c2cSDavid du Colombier
38*0b459c2cSDavid du Colombier static FILE *pfp; /* patch file pointer */
39*0b459c2cSDavid du Colombier static int p_says_nonexistent[2]; /* [0] for old file, [1] for new;
40*0b459c2cSDavid du Colombier value is 0 for nonempty, 1 for empty, 2 for nonexistent */
41*0b459c2cSDavid du Colombier static int p_rfc934_nesting; /* RFC 934 nesting level */
42*0b459c2cSDavid du Colombier static time_t p_timestamp[2]; /* timestamps in patch headers */
43*0b459c2cSDavid du Colombier static off_t p_filesize; /* size of the patch file */
44*0b459c2cSDavid du Colombier static LINENUM p_first; /* 1st line number */
45*0b459c2cSDavid du Colombier static LINENUM p_newfirst; /* 1st line number of replacement */
46*0b459c2cSDavid du Colombier static LINENUM p_ptrn_lines; /* # lines in pattern */
47*0b459c2cSDavid du Colombier static LINENUM p_repl_lines; /* # lines in replacement text */
48*0b459c2cSDavid du Colombier static LINENUM p_end = -1; /* last line in hunk */
49*0b459c2cSDavid du Colombier static LINENUM p_max; /* max allowed value of p_end */
50*0b459c2cSDavid du Colombier static LINENUM p_prefix_context; /* # of prefix context lines */
51*0b459c2cSDavid du Colombier static LINENUM p_suffix_context; /* # of suffix context lines */
52*0b459c2cSDavid du Colombier static LINENUM p_input_line; /* current line # from patch file */
53*0b459c2cSDavid du Colombier static char **p_line; /* the text of the hunk */
54*0b459c2cSDavid du Colombier static size_t *p_len; /* line length including \n if any */
55*0b459c2cSDavid du Colombier static char *p_Char; /* +, -, and ! */
56*0b459c2cSDavid du Colombier static LINENUM hunkmax = INITHUNKMAX; /* size of above arrays */
57*0b459c2cSDavid du Colombier static int p_indent; /* indent to patch */
58*0b459c2cSDavid du Colombier static file_offset p_base; /* where to intuit this time */
59*0b459c2cSDavid du Colombier static LINENUM p_bline; /* line # of p_base */
60*0b459c2cSDavid du Colombier static file_offset p_start; /* where intuit found a patch */
61*0b459c2cSDavid du Colombier static LINENUM p_sline; /* and the line number for it */
62*0b459c2cSDavid du Colombier static LINENUM p_hunk_beg; /* line number of current hunk */
63*0b459c2cSDavid du Colombier static LINENUM p_efake = -1; /* end of faked up lines--don't free */
64*0b459c2cSDavid du Colombier static LINENUM p_bfake = -1; /* beg of faked up lines */
65*0b459c2cSDavid du Colombier
66*0b459c2cSDavid du Colombier enum nametype { OLD, NEW, INDEX, NONE };
67*0b459c2cSDavid du Colombier
68*0b459c2cSDavid du Colombier static enum diff intuit_diff_type PARAMS ((void));
69*0b459c2cSDavid du Colombier static enum nametype best_name PARAMS ((char * const *, int const *));
70*0b459c2cSDavid du Colombier static int prefix_components PARAMS ((char *, int));
71*0b459c2cSDavid du Colombier static size_t pget_line PARAMS ((int, int));
72*0b459c2cSDavid du Colombier static size_t get_line PARAMS ((void));
73*0b459c2cSDavid du Colombier static bool incomplete_line PARAMS ((void));
74*0b459c2cSDavid du Colombier static bool grow_hunkmax PARAMS ((void));
75*0b459c2cSDavid du Colombier static void malformed PARAMS ((void)) __attribute__ ((noreturn));
76*0b459c2cSDavid du Colombier static void next_intuit_at PARAMS ((file_offset, LINENUM));
77*0b459c2cSDavid du Colombier static void skip_to PARAMS ((file_offset, LINENUM));
78*0b459c2cSDavid du Colombier
79*0b459c2cSDavid du Colombier /* Prepare to look for the next patch in the patch file. */
80*0b459c2cSDavid du Colombier
81*0b459c2cSDavid du Colombier void
re_patch()82*0b459c2cSDavid du Colombier re_patch()
83*0b459c2cSDavid du Colombier {
84*0b459c2cSDavid du Colombier p_first = 0;
85*0b459c2cSDavid du Colombier p_newfirst = 0;
86*0b459c2cSDavid du Colombier p_ptrn_lines = 0;
87*0b459c2cSDavid du Colombier p_repl_lines = 0;
88*0b459c2cSDavid du Colombier p_end = -1;
89*0b459c2cSDavid du Colombier p_max = 0;
90*0b459c2cSDavid du Colombier p_indent = 0;
91*0b459c2cSDavid du Colombier }
92*0b459c2cSDavid du Colombier
93*0b459c2cSDavid du Colombier /* Open the patch file at the beginning of time. */
94*0b459c2cSDavid du Colombier
95*0b459c2cSDavid du Colombier void
open_patch_file(filename)96*0b459c2cSDavid du Colombier open_patch_file(filename)
97*0b459c2cSDavid du Colombier char const *filename;
98*0b459c2cSDavid du Colombier {
99*0b459c2cSDavid du Colombier file_offset file_pos = 0;
100*0b459c2cSDavid du Colombier struct stat st;
101*0b459c2cSDavid du Colombier if (!filename || !*filename || strEQ (filename, "-"))
102*0b459c2cSDavid du Colombier {
103*0b459c2cSDavid du Colombier file_offset stdin_pos;
104*0b459c2cSDavid du Colombier #if HAVE_SETMODE
105*0b459c2cSDavid du Colombier if (binary_transput)
106*0b459c2cSDavid du Colombier {
107*0b459c2cSDavid du Colombier if (isatty (STDIN_FILENO))
108*0b459c2cSDavid du Colombier fatal ("cannot read binary data from tty on this platform");
109*0b459c2cSDavid du Colombier setmode (STDIN_FILENO, O_BINARY);
110*0b459c2cSDavid du Colombier }
111*0b459c2cSDavid du Colombier #endif
112*0b459c2cSDavid du Colombier if (fstat (STDIN_FILENO, &st) != 0)
113*0b459c2cSDavid du Colombier pfatal ("fstat");
114*0b459c2cSDavid du Colombier if (S_ISREG (st.st_mode) && (stdin_pos = file_tell (stdin)) != -1)
115*0b459c2cSDavid du Colombier {
116*0b459c2cSDavid du Colombier pfp = stdin;
117*0b459c2cSDavid du Colombier file_pos = stdin_pos;
118*0b459c2cSDavid du Colombier }
119*0b459c2cSDavid du Colombier else
120*0b459c2cSDavid du Colombier {
121*0b459c2cSDavid du Colombier size_t charsread;
122*0b459c2cSDavid du Colombier pfp = fopen (TMPPATNAME, "w+b");
123*0b459c2cSDavid du Colombier if (!pfp)
124*0b459c2cSDavid du Colombier pfatal ("can't create `%s'", TMPPATNAME);
125*0b459c2cSDavid du Colombier for (st.st_size = 0;
126*0b459c2cSDavid du Colombier (charsread = fread (buf, 1, bufsize, stdin)) != 0;
127*0b459c2cSDavid du Colombier st.st_size += charsread)
128*0b459c2cSDavid du Colombier if (fwrite (buf, 1, charsread, pfp) != charsread)
129*0b459c2cSDavid du Colombier write_fatal ();
130*0b459c2cSDavid du Colombier if (ferror (stdin) || fclose (stdin) != 0)
131*0b459c2cSDavid du Colombier read_fatal ();
132*0b459c2cSDavid du Colombier if (fflush (pfp) != 0
133*0b459c2cSDavid du Colombier || file_seek (pfp, (file_offset) 0, SEEK_SET) != 0)
134*0b459c2cSDavid du Colombier write_fatal ();
135*0b459c2cSDavid du Colombier }
136*0b459c2cSDavid du Colombier }
137*0b459c2cSDavid du Colombier else
138*0b459c2cSDavid du Colombier {
139*0b459c2cSDavid du Colombier pfp = fopen (filename, binary_transput ? "rb" : "r");
140*0b459c2cSDavid du Colombier if (!pfp)
141*0b459c2cSDavid du Colombier pfatal ("can't open patch file `%s'", filename);
142*0b459c2cSDavid du Colombier if (fstat (fileno (pfp), &st) != 0)
143*0b459c2cSDavid du Colombier pfatal ("fstat");
144*0b459c2cSDavid du Colombier }
145*0b459c2cSDavid du Colombier p_filesize = st.st_size;
146*0b459c2cSDavid du Colombier if (p_filesize != (file_offset) p_filesize)
147*0b459c2cSDavid du Colombier fatal ("patch file is too long");
148*0b459c2cSDavid du Colombier next_intuit_at (file_pos, (LINENUM) 1);
149*0b459c2cSDavid du Colombier set_hunkmax();
150*0b459c2cSDavid du Colombier }
151*0b459c2cSDavid du Colombier
152*0b459c2cSDavid du Colombier /* Make sure our dynamically realloced tables are malloced to begin with. */
153*0b459c2cSDavid du Colombier
154*0b459c2cSDavid du Colombier void
set_hunkmax()155*0b459c2cSDavid du Colombier set_hunkmax()
156*0b459c2cSDavid du Colombier {
157*0b459c2cSDavid du Colombier if (!p_line)
158*0b459c2cSDavid du Colombier p_line = (char **) malloc (hunkmax * sizeof *p_line);
159*0b459c2cSDavid du Colombier if (!p_len)
160*0b459c2cSDavid du Colombier p_len = (size_t *) malloc (hunkmax * sizeof *p_len);
161*0b459c2cSDavid du Colombier if (!p_Char)
162*0b459c2cSDavid du Colombier p_Char = malloc (hunkmax * sizeof *p_Char);
163*0b459c2cSDavid du Colombier }
164*0b459c2cSDavid du Colombier
165*0b459c2cSDavid du Colombier /* Enlarge the arrays containing the current hunk of patch. */
166*0b459c2cSDavid du Colombier
167*0b459c2cSDavid du Colombier static bool
grow_hunkmax()168*0b459c2cSDavid du Colombier grow_hunkmax()
169*0b459c2cSDavid du Colombier {
170*0b459c2cSDavid du Colombier hunkmax *= 2;
171*0b459c2cSDavid du Colombier assert (p_line && p_len && p_Char);
172*0b459c2cSDavid du Colombier if ((p_line = (char **) realloc (p_line, hunkmax * sizeof (*p_line)))
173*0b459c2cSDavid du Colombier && (p_len = (size_t *) realloc (p_len, hunkmax * sizeof (*p_len)))
174*0b459c2cSDavid du Colombier && (p_Char = realloc (p_Char, hunkmax * sizeof (*p_Char))))
175*0b459c2cSDavid du Colombier return TRUE;
176*0b459c2cSDavid du Colombier if (!using_plan_a)
177*0b459c2cSDavid du Colombier memory_fatal ();
178*0b459c2cSDavid du Colombier /* Don't free previous values of p_line etc.,
179*0b459c2cSDavid du Colombier since some broken implementations free them for us.
180*0b459c2cSDavid du Colombier Whatever is null will be allocated again from within plan_a (),
181*0b459c2cSDavid du Colombier of all places. */
182*0b459c2cSDavid du Colombier return FALSE;
183*0b459c2cSDavid du Colombier }
184*0b459c2cSDavid du Colombier
185*0b459c2cSDavid du Colombier /* True if the remainder of the patch file contains a diff of some sort. */
186*0b459c2cSDavid du Colombier
187*0b459c2cSDavid du Colombier bool
there_is_another_patch()188*0b459c2cSDavid du Colombier there_is_another_patch()
189*0b459c2cSDavid du Colombier {
190*0b459c2cSDavid du Colombier if (p_base != 0 && p_base >= p_filesize) {
191*0b459c2cSDavid du Colombier if (verbosity == VERBOSE)
192*0b459c2cSDavid du Colombier say ("done\n");
193*0b459c2cSDavid du Colombier return FALSE;
194*0b459c2cSDavid du Colombier }
195*0b459c2cSDavid du Colombier if (verbosity == VERBOSE)
196*0b459c2cSDavid du Colombier say ("Hmm...");
197*0b459c2cSDavid du Colombier diff_type = intuit_diff_type();
198*0b459c2cSDavid du Colombier if (diff_type == NO_DIFF) {
199*0b459c2cSDavid du Colombier if (verbosity == VERBOSE)
200*0b459c2cSDavid du Colombier say (p_base
201*0b459c2cSDavid du Colombier ? " Ignoring the trailing garbage.\ndone\n"
202*0b459c2cSDavid du Colombier : " I can't seem to find a patch in there anywhere.\n");
203*0b459c2cSDavid du Colombier if (! p_base && p_filesize)
204*0b459c2cSDavid du Colombier fatal ("Only garbage was found in the patch input.");
205*0b459c2cSDavid du Colombier return FALSE;
206*0b459c2cSDavid du Colombier }
207*0b459c2cSDavid du Colombier if (skip_rest_of_patch)
208*0b459c2cSDavid du Colombier {
209*0b459c2cSDavid du Colombier Fseek (pfp, p_start, SEEK_SET);
210*0b459c2cSDavid du Colombier p_input_line = p_sline - 1;
211*0b459c2cSDavid du Colombier return TRUE;
212*0b459c2cSDavid du Colombier }
213*0b459c2cSDavid du Colombier if (verbosity == VERBOSE)
214*0b459c2cSDavid du Colombier say (" %sooks like %s to me...\n",
215*0b459c2cSDavid du Colombier (p_base == 0 ? "L" : "The next patch l"),
216*0b459c2cSDavid du Colombier diff_type == UNI_DIFF ? "a unified diff" :
217*0b459c2cSDavid du Colombier diff_type == CONTEXT_DIFF ? "a context diff" :
218*0b459c2cSDavid du Colombier diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" :
219*0b459c2cSDavid du Colombier diff_type == NORMAL_DIFF ? "a normal diff" :
220*0b459c2cSDavid du Colombier "an ed script" );
221*0b459c2cSDavid du Colombier
222*0b459c2cSDavid du Colombier if (verbosity != SILENT)
223*0b459c2cSDavid du Colombier {
224*0b459c2cSDavid du Colombier if (p_indent)
225*0b459c2cSDavid du Colombier say ("(Patch is indented %d space%s.)\n", p_indent, p_indent==1?"":"s");
226*0b459c2cSDavid du Colombier if (! inname)
227*0b459c2cSDavid du Colombier {
228*0b459c2cSDavid du Colombier say ("can't find file to patch at input line %ld\n",
229*0b459c2cSDavid du Colombier p_sline);
230*0b459c2cSDavid du Colombier say (strippath == INT_MAX
231*0b459c2cSDavid du Colombier ? "Perhaps you should have used the -p or --strip option?\n"
232*0b459c2cSDavid du Colombier : "Perhaps you used the wrong -p or --strip option?\n");
233*0b459c2cSDavid du Colombier }
234*0b459c2cSDavid du Colombier }
235*0b459c2cSDavid du Colombier
236*0b459c2cSDavid du Colombier skip_to(p_start,p_sline);
237*0b459c2cSDavid du Colombier while (!inname) {
238*0b459c2cSDavid du Colombier if (force || batch) {
239*0b459c2cSDavid du Colombier say ("No file to patch. Skipping patch.\n");
240*0b459c2cSDavid du Colombier skip_rest_of_patch = TRUE;
241*0b459c2cSDavid du Colombier return TRUE;
242*0b459c2cSDavid du Colombier }
243*0b459c2cSDavid du Colombier ask ("File to patch: ");
244*0b459c2cSDavid du Colombier inname = fetchname (buf, 0, (time_t *) 0);
245*0b459c2cSDavid du Colombier if (inname)
246*0b459c2cSDavid du Colombier {
247*0b459c2cSDavid du Colombier if (stat (inname, &instat) == 0)
248*0b459c2cSDavid du Colombier {
249*0b459c2cSDavid du Colombier inerrno = 0;
250*0b459c2cSDavid du Colombier invc = -1;
251*0b459c2cSDavid du Colombier }
252*0b459c2cSDavid du Colombier else
253*0b459c2cSDavid du Colombier {
254*0b459c2cSDavid du Colombier perror (inname);
255*0b459c2cSDavid du Colombier free (inname);
256*0b459c2cSDavid du Colombier inname = 0;
257*0b459c2cSDavid du Colombier }
258*0b459c2cSDavid du Colombier }
259*0b459c2cSDavid du Colombier if (!inname) {
260*0b459c2cSDavid du Colombier ask ("Skip this patch? [y] ");
261*0b459c2cSDavid du Colombier if (*buf != 'n') {
262*0b459c2cSDavid du Colombier if (verbosity != SILENT)
263*0b459c2cSDavid du Colombier say ("Skipping patch.\n");
264*0b459c2cSDavid du Colombier skip_rest_of_patch = TRUE;
265*0b459c2cSDavid du Colombier return TRUE;
266*0b459c2cSDavid du Colombier }
267*0b459c2cSDavid du Colombier }
268*0b459c2cSDavid du Colombier }
269*0b459c2cSDavid du Colombier return TRUE;
270*0b459c2cSDavid du Colombier }
271*0b459c2cSDavid du Colombier
272*0b459c2cSDavid du Colombier /* Determine what kind of diff is in the remaining part of the patch file. */
273*0b459c2cSDavid du Colombier
274*0b459c2cSDavid du Colombier static enum diff
intuit_diff_type()275*0b459c2cSDavid du Colombier intuit_diff_type()
276*0b459c2cSDavid du Colombier {
277*0b459c2cSDavid du Colombier register char *s;
278*0b459c2cSDavid du Colombier register char *t;
279*0b459c2cSDavid du Colombier register int indent;
280*0b459c2cSDavid du Colombier register file_offset this_line = 0;
281*0b459c2cSDavid du Colombier register file_offset previous_line;
282*0b459c2cSDavid du Colombier register file_offset first_command_line = -1;
283*0b459c2cSDavid du Colombier LINENUM fcl_line = 0; /* Pacify `gcc -W'. */
284*0b459c2cSDavid du Colombier register bool last_line_was_command = FALSE;
285*0b459c2cSDavid du Colombier register bool this_is_a_command = FALSE;
286*0b459c2cSDavid du Colombier register bool stars_last_line = FALSE;
287*0b459c2cSDavid du Colombier register bool stars_this_line = FALSE;
288*0b459c2cSDavid du Colombier enum nametype i;
289*0b459c2cSDavid du Colombier char *name[3];
290*0b459c2cSDavid du Colombier struct stat st[3];
291*0b459c2cSDavid du Colombier int stat_errno[3];
292*0b459c2cSDavid du Colombier int version_controlled[3];
293*0b459c2cSDavid du Colombier register enum diff retval;
294*0b459c2cSDavid du Colombier
295*0b459c2cSDavid du Colombier name[OLD] = name[NEW] = name[INDEX] = 0;
296*0b459c2cSDavid du Colombier version_controlled[OLD] = -1;
297*0b459c2cSDavid du Colombier version_controlled[NEW] = -1;
298*0b459c2cSDavid du Colombier version_controlled[INDEX] = -1;
299*0b459c2cSDavid du Colombier p_rfc934_nesting = 0;
300*0b459c2cSDavid du Colombier p_timestamp[OLD] = p_timestamp[NEW] = (time_t) -1;
301*0b459c2cSDavid du Colombier p_says_nonexistent[OLD] = p_says_nonexistent[NEW] = 0;
302*0b459c2cSDavid du Colombier Fseek (pfp, p_base, SEEK_SET);
303*0b459c2cSDavid du Colombier p_input_line = p_bline - 1;
304*0b459c2cSDavid du Colombier for (;;) {
305*0b459c2cSDavid du Colombier previous_line = this_line;
306*0b459c2cSDavid du Colombier last_line_was_command = this_is_a_command;
307*0b459c2cSDavid du Colombier stars_last_line = stars_this_line;
308*0b459c2cSDavid du Colombier this_line = file_tell (pfp);
309*0b459c2cSDavid du Colombier indent = 0;
310*0b459c2cSDavid du Colombier if (! pget_line (0, 0)) {
311*0b459c2cSDavid du Colombier if (first_command_line >= 0) {
312*0b459c2cSDavid du Colombier /* nothing but deletes!? */
313*0b459c2cSDavid du Colombier p_start = first_command_line;
314*0b459c2cSDavid du Colombier p_sline = fcl_line;
315*0b459c2cSDavid du Colombier retval = ED_DIFF;
316*0b459c2cSDavid du Colombier goto scan_exit;
317*0b459c2cSDavid du Colombier }
318*0b459c2cSDavid du Colombier else {
319*0b459c2cSDavid du Colombier p_start = this_line;
320*0b459c2cSDavid du Colombier p_sline = p_input_line;
321*0b459c2cSDavid du Colombier return NO_DIFF;
322*0b459c2cSDavid du Colombier }
323*0b459c2cSDavid du Colombier }
324*0b459c2cSDavid du Colombier for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) {
325*0b459c2cSDavid du Colombier if (*s == '\t')
326*0b459c2cSDavid du Colombier indent = (indent + 8) & ~7;
327*0b459c2cSDavid du Colombier else
328*0b459c2cSDavid du Colombier indent++;
329*0b459c2cSDavid du Colombier }
330*0b459c2cSDavid du Colombier for (t = s; ISDIGIT (*t) || *t == ','; t++)
331*0b459c2cSDavid du Colombier continue;
332*0b459c2cSDavid du Colombier this_is_a_command = (ISDIGIT (*s) &&
333*0b459c2cSDavid du Colombier (*t == 'd' || *t == 'c' || *t == 'a') );
334*0b459c2cSDavid du Colombier if (first_command_line < 0 && this_is_a_command) {
335*0b459c2cSDavid du Colombier first_command_line = this_line;
336*0b459c2cSDavid du Colombier fcl_line = p_input_line;
337*0b459c2cSDavid du Colombier p_indent = indent; /* assume this for now */
338*0b459c2cSDavid du Colombier }
339*0b459c2cSDavid du Colombier if (!stars_last_line && strnEQ(s, "*** ", 4))
340*0b459c2cSDavid du Colombier name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]);
341*0b459c2cSDavid du Colombier else if (strnEQ(s, "+++ ", 4))
342*0b459c2cSDavid du Colombier /* Swap with NEW below. */
343*0b459c2cSDavid du Colombier name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]);
344*0b459c2cSDavid du Colombier else if (strnEQ(s, "Index:", 6))
345*0b459c2cSDavid du Colombier name[INDEX] = fetchname (s+6, strippath, (time_t *) 0);
346*0b459c2cSDavid du Colombier else if (strnEQ(s, "Prereq:", 7)) {
347*0b459c2cSDavid du Colombier for (t = s + 7; ISSPACE ((unsigned char) *t); t++)
348*0b459c2cSDavid du Colombier continue;
349*0b459c2cSDavid du Colombier revision = t;
350*0b459c2cSDavid du Colombier for (t = revision; *t && !ISSPACE ((unsigned char) *t); t++)
351*0b459c2cSDavid du Colombier continue;
352*0b459c2cSDavid du Colombier if (t == revision)
353*0b459c2cSDavid du Colombier revision = 0;
354*0b459c2cSDavid du Colombier else {
355*0b459c2cSDavid du Colombier char oldc = *t;
356*0b459c2cSDavid du Colombier *t = '\0';
357*0b459c2cSDavid du Colombier revision = savestr (revision);
358*0b459c2cSDavid du Colombier *t = oldc;
359*0b459c2cSDavid du Colombier }
360*0b459c2cSDavid du Colombier } else
361*0b459c2cSDavid du Colombier {
362*0b459c2cSDavid du Colombier for (t = s; t[0] == '-' && t[1] == ' '; t += 2)
363*0b459c2cSDavid du Colombier continue;
364*0b459c2cSDavid du Colombier if (strnEQ(t, "--- ", 4))
365*0b459c2cSDavid du Colombier {
366*0b459c2cSDavid du Colombier time_t timestamp = (time_t) -1;
367*0b459c2cSDavid du Colombier name[NEW] = fetchname (t+4, strippath, ×tamp);
368*0b459c2cSDavid du Colombier if (timestamp != (time_t) -1)
369*0b459c2cSDavid du Colombier {
370*0b459c2cSDavid du Colombier p_timestamp[NEW] = timestamp;
371*0b459c2cSDavid du Colombier p_rfc934_nesting = (t - s) >> 1;
372*0b459c2cSDavid du Colombier }
373*0b459c2cSDavid du Colombier }
374*0b459c2cSDavid du Colombier }
375*0b459c2cSDavid du Colombier if ((diff_type == NO_DIFF || diff_type == ED_DIFF) &&
376*0b459c2cSDavid du Colombier first_command_line >= 0 &&
377*0b459c2cSDavid du Colombier strEQ(s, ".\n") ) {
378*0b459c2cSDavid du Colombier p_indent = indent;
379*0b459c2cSDavid du Colombier p_start = first_command_line;
380*0b459c2cSDavid du Colombier p_sline = fcl_line;
381*0b459c2cSDavid du Colombier retval = ED_DIFF;
382*0b459c2cSDavid du Colombier goto scan_exit;
383*0b459c2cSDavid du Colombier }
384*0b459c2cSDavid du Colombier if ((diff_type == NO_DIFF || diff_type == UNI_DIFF)
385*0b459c2cSDavid du Colombier && strnEQ(s, "@@ -", 4)) {
386*0b459c2cSDavid du Colombier
387*0b459c2cSDavid du Colombier /* `name' and `p_timestamp' are backwards; swap them. */
388*0b459c2cSDavid du Colombier time_t ti = p_timestamp[OLD];
389*0b459c2cSDavid du Colombier p_timestamp[OLD] = p_timestamp[NEW];
390*0b459c2cSDavid du Colombier p_timestamp[NEW] = ti;
391*0b459c2cSDavid du Colombier t = name[OLD];
392*0b459c2cSDavid du Colombier name[OLD] = name[NEW];
393*0b459c2cSDavid du Colombier name[NEW] = t;
394*0b459c2cSDavid du Colombier
395*0b459c2cSDavid du Colombier s += 4;
396*0b459c2cSDavid du Colombier if (! atol (s))
397*0b459c2cSDavid du Colombier p_says_nonexistent[OLD] = 1 + ! p_timestamp[OLD];
398*0b459c2cSDavid du Colombier while (*s != ' ' && *s != '\n')
399*0b459c2cSDavid du Colombier s++;
400*0b459c2cSDavid du Colombier while (*s == ' ')
401*0b459c2cSDavid du Colombier s++;
402*0b459c2cSDavid du Colombier if (! atol (s))
403*0b459c2cSDavid du Colombier p_says_nonexistent[NEW] = 1 + ! p_timestamp[NEW];
404*0b459c2cSDavid du Colombier p_indent = indent;
405*0b459c2cSDavid du Colombier p_start = this_line;
406*0b459c2cSDavid du Colombier p_sline = p_input_line;
407*0b459c2cSDavid du Colombier retval = UNI_DIFF;
408*0b459c2cSDavid du Colombier if (! ((name[OLD] || ! p_timestamp[OLD])
409*0b459c2cSDavid du Colombier && (name[NEW] || ! p_timestamp[NEW])))
410*0b459c2cSDavid du Colombier say ("missing header for unified diff at line %ld of patch\n",
411*0b459c2cSDavid du Colombier p_sline);
412*0b459c2cSDavid du Colombier goto scan_exit;
413*0b459c2cSDavid du Colombier }
414*0b459c2cSDavid du Colombier stars_this_line = strnEQ(s, "********", 8);
415*0b459c2cSDavid du Colombier if ((diff_type == NO_DIFF
416*0b459c2cSDavid du Colombier || diff_type == CONTEXT_DIFF
417*0b459c2cSDavid du Colombier || diff_type == NEW_CONTEXT_DIFF)
418*0b459c2cSDavid du Colombier && stars_last_line && strnEQ (s, "*** ", 4)) {
419*0b459c2cSDavid du Colombier s += 4;
420*0b459c2cSDavid du Colombier if (! atol (s))
421*0b459c2cSDavid du Colombier p_says_nonexistent[OLD] = 1 + ! p_timestamp[OLD];
422*0b459c2cSDavid du Colombier /* if this is a new context diff the character just before */
423*0b459c2cSDavid du Colombier /* the newline is a '*'. */
424*0b459c2cSDavid du Colombier while (*s != '\n')
425*0b459c2cSDavid du Colombier s++;
426*0b459c2cSDavid du Colombier p_indent = indent;
427*0b459c2cSDavid du Colombier p_start = previous_line;
428*0b459c2cSDavid du Colombier p_sline = p_input_line - 1;
429*0b459c2cSDavid du Colombier retval = (*(s-1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF);
430*0b459c2cSDavid du Colombier
431*0b459c2cSDavid du Colombier {
432*0b459c2cSDavid du Colombier /* Scan the first hunk to see whether the file contents
433*0b459c2cSDavid du Colombier appear to have been deleted. */
434*0b459c2cSDavid du Colombier file_offset saved_p_base = p_base;
435*0b459c2cSDavid du Colombier LINENUM saved_p_bline = p_bline;
436*0b459c2cSDavid du Colombier Fseek (pfp, previous_line, SEEK_SET);
437*0b459c2cSDavid du Colombier p_input_line -= 2;
438*0b459c2cSDavid du Colombier if (another_hunk (retval, 0)
439*0b459c2cSDavid du Colombier && ! p_repl_lines && p_newfirst == 1)
440*0b459c2cSDavid du Colombier p_says_nonexistent[NEW] = 1 + ! p_timestamp[NEW];
441*0b459c2cSDavid du Colombier next_intuit_at (saved_p_base, saved_p_bline);
442*0b459c2cSDavid du Colombier }
443*0b459c2cSDavid du Colombier
444*0b459c2cSDavid du Colombier if (! ((name[OLD] || ! p_timestamp[OLD])
445*0b459c2cSDavid du Colombier && (name[NEW] || ! p_timestamp[NEW])))
446*0b459c2cSDavid du Colombier say ("missing header for context diff at line %ld of patch\n",
447*0b459c2cSDavid du Colombier p_sline);
448*0b459c2cSDavid du Colombier goto scan_exit;
449*0b459c2cSDavid du Colombier }
450*0b459c2cSDavid du Colombier if ((diff_type == NO_DIFF || diff_type == NORMAL_DIFF) &&
451*0b459c2cSDavid du Colombier last_line_was_command &&
452*0b459c2cSDavid du Colombier (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2)) ) {
453*0b459c2cSDavid du Colombier p_start = previous_line;
454*0b459c2cSDavid du Colombier p_sline = p_input_line - 1;
455*0b459c2cSDavid du Colombier p_indent = indent;
456*0b459c2cSDavid du Colombier retval = NORMAL_DIFF;
457*0b459c2cSDavid du Colombier goto scan_exit;
458*0b459c2cSDavid du Colombier }
459*0b459c2cSDavid du Colombier }
460*0b459c2cSDavid du Colombier
461*0b459c2cSDavid du Colombier scan_exit:
462*0b459c2cSDavid du Colombier
463*0b459c2cSDavid du Colombier /* To intuit `inname', the name of the file to patch,
464*0b459c2cSDavid du Colombier use the algorithm specified by POSIX 1003.2b/D11 section 5.22.7.2
465*0b459c2cSDavid du Colombier (with some modifications if posixly_correct is zero):
466*0b459c2cSDavid du Colombier
467*0b459c2cSDavid du Colombier - Take the old and new names from the context header if present,
468*0b459c2cSDavid du Colombier and take the index name from the `Index:' line if present and
469*0b459c2cSDavid du Colombier if either the old and new names are both absent
470*0b459c2cSDavid du Colombier or posixly_correct is nonzero.
471*0b459c2cSDavid du Colombier Consider the file names to be in the order (old, new, index).
472*0b459c2cSDavid du Colombier - If some named files exist, use the first one if posixly_correct
473*0b459c2cSDavid du Colombier is nonzero, the best one otherwise.
474*0b459c2cSDavid du Colombier - If patch_get is nonzero, and no named files exist,
475*0b459c2cSDavid du Colombier but an RCS or SCCS master file exists,
476*0b459c2cSDavid du Colombier use the first named file with an RCS or SCCS master.
477*0b459c2cSDavid du Colombier - If no named files exist, no RCS or SCCS master was found,
478*0b459c2cSDavid du Colombier some names are given, posixly_correct is zero,
479*0b459c2cSDavid du Colombier and the patch appears to create a file, then use the best name
480*0b459c2cSDavid du Colombier requiring the creation of the fewest directories.
481*0b459c2cSDavid du Colombier - Otherwise, report failure by setting `inname' to 0;
482*0b459c2cSDavid du Colombier this causes our invoker to ask the user for a file name. */
483*0b459c2cSDavid du Colombier
484*0b459c2cSDavid du Colombier i = NONE;
485*0b459c2cSDavid du Colombier
486*0b459c2cSDavid du Colombier if (!inname)
487*0b459c2cSDavid du Colombier {
488*0b459c2cSDavid du Colombier enum nametype i0 = NONE;
489*0b459c2cSDavid du Colombier
490*0b459c2cSDavid du Colombier if (! posixly_correct && (name[OLD] || name[NEW]) && name[INDEX])
491*0b459c2cSDavid du Colombier {
492*0b459c2cSDavid du Colombier free (name[INDEX]);
493*0b459c2cSDavid du Colombier name[INDEX] = 0;
494*0b459c2cSDavid du Colombier }
495*0b459c2cSDavid du Colombier
496*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
497*0b459c2cSDavid du Colombier if (name[i])
498*0b459c2cSDavid du Colombier {
499*0b459c2cSDavid du Colombier if (i0 != NONE && strcmp (name[i0], name[i]) == 0)
500*0b459c2cSDavid du Colombier {
501*0b459c2cSDavid du Colombier /* It's the same name as before; reuse stat results. */
502*0b459c2cSDavid du Colombier stat_errno[i] = stat_errno[i0];
503*0b459c2cSDavid du Colombier if (! stat_errno[i])
504*0b459c2cSDavid du Colombier st[i] = st[i0];
505*0b459c2cSDavid du Colombier }
506*0b459c2cSDavid du Colombier else if (stat (name[i], &st[i]) != 0)
507*0b459c2cSDavid du Colombier stat_errno[i] = errno;
508*0b459c2cSDavid du Colombier else
509*0b459c2cSDavid du Colombier {
510*0b459c2cSDavid du Colombier stat_errno[i] = 0;
511*0b459c2cSDavid du Colombier if (posixly_correct)
512*0b459c2cSDavid du Colombier break;
513*0b459c2cSDavid du Colombier }
514*0b459c2cSDavid du Colombier i0 = i;
515*0b459c2cSDavid du Colombier }
516*0b459c2cSDavid du Colombier
517*0b459c2cSDavid du Colombier if (! posixly_correct)
518*0b459c2cSDavid du Colombier {
519*0b459c2cSDavid du Colombier i = best_name (name, stat_errno);
520*0b459c2cSDavid du Colombier
521*0b459c2cSDavid du Colombier if (i == NONE && patch_get)
522*0b459c2cSDavid du Colombier {
523*0b459c2cSDavid du Colombier enum nametype nope = NONE;
524*0b459c2cSDavid du Colombier
525*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
526*0b459c2cSDavid du Colombier if (name[i])
527*0b459c2cSDavid du Colombier {
528*0b459c2cSDavid du Colombier char const *cs;
529*0b459c2cSDavid du Colombier char *getbuf;
530*0b459c2cSDavid du Colombier char *diffbuf;
531*0b459c2cSDavid du Colombier int readonly = outfile && strcmp (outfile, name[i]) != 0;
532*0b459c2cSDavid du Colombier
533*0b459c2cSDavid du Colombier if (nope == NONE || strcmp (name[nope], name[i]) != 0)
534*0b459c2cSDavid du Colombier {
535*0b459c2cSDavid du Colombier cs = (version_controller
536*0b459c2cSDavid du Colombier (name[i], readonly, (struct stat *) 0,
537*0b459c2cSDavid du Colombier &getbuf, &diffbuf));
538*0b459c2cSDavid du Colombier version_controlled[i] = !! cs;
539*0b459c2cSDavid du Colombier if (cs)
540*0b459c2cSDavid du Colombier {
541*0b459c2cSDavid du Colombier if (version_get (name[i], cs, 0, readonly,
542*0b459c2cSDavid du Colombier getbuf, &st[i]))
543*0b459c2cSDavid du Colombier stat_errno[i] = 0;
544*0b459c2cSDavid du Colombier else
545*0b459c2cSDavid du Colombier version_controlled[i] = 0;
546*0b459c2cSDavid du Colombier
547*0b459c2cSDavid du Colombier free (getbuf);
548*0b459c2cSDavid du Colombier free (diffbuf);
549*0b459c2cSDavid du Colombier
550*0b459c2cSDavid du Colombier if (! stat_errno[i])
551*0b459c2cSDavid du Colombier break;
552*0b459c2cSDavid du Colombier }
553*0b459c2cSDavid du Colombier }
554*0b459c2cSDavid du Colombier
555*0b459c2cSDavid du Colombier nope = i;
556*0b459c2cSDavid du Colombier }
557*0b459c2cSDavid du Colombier }
558*0b459c2cSDavid du Colombier
559*0b459c2cSDavid du Colombier if (p_says_nonexistent[reverse ^ (i == NONE || st[i].st_size == 0)])
560*0b459c2cSDavid du Colombier {
561*0b459c2cSDavid du Colombier assert (i0 != NONE);
562*0b459c2cSDavid du Colombier if (ok_to_reverse
563*0b459c2cSDavid du Colombier ("The next patch%s would %s the file `%s',\nwhich %s!",
564*0b459c2cSDavid du Colombier reverse ? ", when reversed," : "",
565*0b459c2cSDavid du Colombier (i == NONE ? "delete"
566*0b459c2cSDavid du Colombier : st[i].st_size == 0 ? "empty out"
567*0b459c2cSDavid du Colombier : "create"),
568*0b459c2cSDavid du Colombier name[i == NONE || st[i].st_size == 0 ? i0 : i],
569*0b459c2cSDavid du Colombier (i == NONE ? "does not exist"
570*0b459c2cSDavid du Colombier : st[i].st_size == 0 ? "is already empty"
571*0b459c2cSDavid du Colombier : "already exists")))
572*0b459c2cSDavid du Colombier reverse ^= 1;
573*0b459c2cSDavid du Colombier }
574*0b459c2cSDavid du Colombier
575*0b459c2cSDavid du Colombier if (i == NONE && p_says_nonexistent[reverse])
576*0b459c2cSDavid du Colombier {
577*0b459c2cSDavid du Colombier int newdirs[3];
578*0b459c2cSDavid du Colombier int newdirs_min = INT_MAX;
579*0b459c2cSDavid du Colombier int distance_from_minimum[3];
580*0b459c2cSDavid du Colombier
581*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
582*0b459c2cSDavid du Colombier if (name[i])
583*0b459c2cSDavid du Colombier {
584*0b459c2cSDavid du Colombier newdirs[i] = (prefix_components (name[i], 0)
585*0b459c2cSDavid du Colombier - prefix_components (name[i], 1));
586*0b459c2cSDavid du Colombier if (newdirs[i] < newdirs_min)
587*0b459c2cSDavid du Colombier newdirs_min = newdirs[i];
588*0b459c2cSDavid du Colombier }
589*0b459c2cSDavid du Colombier
590*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
591*0b459c2cSDavid du Colombier if (name[i])
592*0b459c2cSDavid du Colombier distance_from_minimum[i] = newdirs[i] - newdirs_min;
593*0b459c2cSDavid du Colombier
594*0b459c2cSDavid du Colombier i = best_name (name, distance_from_minimum);
595*0b459c2cSDavid du Colombier }
596*0b459c2cSDavid du Colombier }
597*0b459c2cSDavid du Colombier }
598*0b459c2cSDavid du Colombier
599*0b459c2cSDavid du Colombier if (i == NONE)
600*0b459c2cSDavid du Colombier inerrno = -1;
601*0b459c2cSDavid du Colombier else
602*0b459c2cSDavid du Colombier {
603*0b459c2cSDavid du Colombier inname = name[i];
604*0b459c2cSDavid du Colombier name[i] = 0;
605*0b459c2cSDavid du Colombier inerrno = stat_errno[i];
606*0b459c2cSDavid du Colombier invc = version_controlled[i];
607*0b459c2cSDavid du Colombier instat = st[i];
608*0b459c2cSDavid du Colombier }
609*0b459c2cSDavid du Colombier
610*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
611*0b459c2cSDavid du Colombier if (name[i])
612*0b459c2cSDavid du Colombier free (name[i]);
613*0b459c2cSDavid du Colombier
614*0b459c2cSDavid du Colombier return retval;
615*0b459c2cSDavid du Colombier }
616*0b459c2cSDavid du Colombier
617*0b459c2cSDavid du Colombier /* Count the path name components in FILENAME's prefix.
618*0b459c2cSDavid du Colombier If CHECKDIRS is nonzero, count only existing directories. */
619*0b459c2cSDavid du Colombier static int
prefix_components(filename,checkdirs)620*0b459c2cSDavid du Colombier prefix_components (filename, checkdirs)
621*0b459c2cSDavid du Colombier char *filename;
622*0b459c2cSDavid du Colombier int checkdirs;
623*0b459c2cSDavid du Colombier {
624*0b459c2cSDavid du Colombier int count = 0;
625*0b459c2cSDavid du Colombier struct stat stat_buf;
626*0b459c2cSDavid du Colombier int stat_result;
627*0b459c2cSDavid du Colombier char *f = filename + FILESYSTEM_PREFIX_LEN (filename);
628*0b459c2cSDavid du Colombier
629*0b459c2cSDavid du Colombier if (*f)
630*0b459c2cSDavid du Colombier while (*++f)
631*0b459c2cSDavid du Colombier if (ISSLASH (f[0]) && ! ISSLASH (f[-1]))
632*0b459c2cSDavid du Colombier {
633*0b459c2cSDavid du Colombier if (checkdirs)
634*0b459c2cSDavid du Colombier {
635*0b459c2cSDavid du Colombier *f = '\0';
636*0b459c2cSDavid du Colombier stat_result = stat (filename, &stat_buf);
637*0b459c2cSDavid du Colombier *f = '/';
638*0b459c2cSDavid du Colombier if (! (stat_result == 0 && S_ISDIR (stat_buf.st_mode)))
639*0b459c2cSDavid du Colombier break;
640*0b459c2cSDavid du Colombier }
641*0b459c2cSDavid du Colombier
642*0b459c2cSDavid du Colombier count++;
643*0b459c2cSDavid du Colombier }
644*0b459c2cSDavid du Colombier
645*0b459c2cSDavid du Colombier return count;
646*0b459c2cSDavid du Colombier }
647*0b459c2cSDavid du Colombier
648*0b459c2cSDavid du Colombier /* Return the index of the best of NAME[OLD], NAME[NEW], and NAME[INDEX].
649*0b459c2cSDavid du Colombier Ignore null names, and ignore NAME[i] if IGNORE[i] is nonzero.
650*0b459c2cSDavid du Colombier Return NONE if all names are ignored. */
651*0b459c2cSDavid du Colombier static enum nametype
best_name(name,ignore)652*0b459c2cSDavid du Colombier best_name (name, ignore)
653*0b459c2cSDavid du Colombier char *const *name;
654*0b459c2cSDavid du Colombier int const *ignore;
655*0b459c2cSDavid du Colombier {
656*0b459c2cSDavid du Colombier enum nametype i;
657*0b459c2cSDavid du Colombier int components[3];
658*0b459c2cSDavid du Colombier int components_min = INT_MAX;
659*0b459c2cSDavid du Colombier size_t basename_len[3];
660*0b459c2cSDavid du Colombier size_t basename_len_min = (size_t) -1;
661*0b459c2cSDavid du Colombier size_t len[3];
662*0b459c2cSDavid du Colombier size_t len_min = (size_t) -1;
663*0b459c2cSDavid du Colombier
664*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
665*0b459c2cSDavid du Colombier if (name[i] && !ignore[i])
666*0b459c2cSDavid du Colombier {
667*0b459c2cSDavid du Colombier /* Take the names with the fewest prefix components. */
668*0b459c2cSDavid du Colombier components[i] = prefix_components (name[i], 0);
669*0b459c2cSDavid du Colombier if (components_min < components[i])
670*0b459c2cSDavid du Colombier continue;
671*0b459c2cSDavid du Colombier components_min = components[i];
672*0b459c2cSDavid du Colombier
673*0b459c2cSDavid du Colombier /* Of those, take the names with the shortest basename. */
674*0b459c2cSDavid du Colombier basename_len[i] = strlen (base_name (name[i]));
675*0b459c2cSDavid du Colombier if (basename_len_min < basename_len[i])
676*0b459c2cSDavid du Colombier continue;
677*0b459c2cSDavid du Colombier basename_len_min = basename_len[i];
678*0b459c2cSDavid du Colombier
679*0b459c2cSDavid du Colombier /* Of those, take the shortest names. */
680*0b459c2cSDavid du Colombier len[i] = strlen (name[i]);
681*0b459c2cSDavid du Colombier if (len_min < len[i])
682*0b459c2cSDavid du Colombier continue;
683*0b459c2cSDavid du Colombier len_min = len[i];
684*0b459c2cSDavid du Colombier }
685*0b459c2cSDavid du Colombier
686*0b459c2cSDavid du Colombier /* Of those, take the first name. */
687*0b459c2cSDavid du Colombier for (i = OLD; i <= INDEX; i++)
688*0b459c2cSDavid du Colombier if (name[i] && !ignore[i]
689*0b459c2cSDavid du Colombier && components[i] == components_min
690*0b459c2cSDavid du Colombier && basename_len[i] == basename_len_min
691*0b459c2cSDavid du Colombier && len[i] == len_min)
692*0b459c2cSDavid du Colombier break;
693*0b459c2cSDavid du Colombier
694*0b459c2cSDavid du Colombier return i;
695*0b459c2cSDavid du Colombier }
696*0b459c2cSDavid du Colombier
697*0b459c2cSDavid du Colombier /* Remember where this patch ends so we know where to start up again. */
698*0b459c2cSDavid du Colombier
699*0b459c2cSDavid du Colombier static void
next_intuit_at(file_pos,file_line)700*0b459c2cSDavid du Colombier next_intuit_at(file_pos,file_line)
701*0b459c2cSDavid du Colombier file_offset file_pos;
702*0b459c2cSDavid du Colombier LINENUM file_line;
703*0b459c2cSDavid du Colombier {
704*0b459c2cSDavid du Colombier p_base = file_pos;
705*0b459c2cSDavid du Colombier p_bline = file_line;
706*0b459c2cSDavid du Colombier }
707*0b459c2cSDavid du Colombier
708*0b459c2cSDavid du Colombier /* Basically a verbose fseek() to the actual diff listing. */
709*0b459c2cSDavid du Colombier
710*0b459c2cSDavid du Colombier static void
skip_to(file_pos,file_line)711*0b459c2cSDavid du Colombier skip_to(file_pos,file_line)
712*0b459c2cSDavid du Colombier file_offset file_pos;
713*0b459c2cSDavid du Colombier LINENUM file_line;
714*0b459c2cSDavid du Colombier {
715*0b459c2cSDavid du Colombier register FILE *i = pfp;
716*0b459c2cSDavid du Colombier register FILE *o = stdout;
717*0b459c2cSDavid du Colombier register int c;
718*0b459c2cSDavid du Colombier
719*0b459c2cSDavid du Colombier assert(p_base <= file_pos);
720*0b459c2cSDavid du Colombier if ((verbosity == VERBOSE || !inname) && p_base < file_pos) {
721*0b459c2cSDavid du Colombier Fseek (i, p_base, SEEK_SET);
722*0b459c2cSDavid du Colombier say ("The text leading up to this was:\n--------------------------\n");
723*0b459c2cSDavid du Colombier
724*0b459c2cSDavid du Colombier while (file_tell (i) < file_pos)
725*0b459c2cSDavid du Colombier {
726*0b459c2cSDavid du Colombier putc ('|', o);
727*0b459c2cSDavid du Colombier do
728*0b459c2cSDavid du Colombier {
729*0b459c2cSDavid du Colombier if ((c = getc (i)) == EOF)
730*0b459c2cSDavid du Colombier read_fatal ();
731*0b459c2cSDavid du Colombier putc (c, o);
732*0b459c2cSDavid du Colombier }
733*0b459c2cSDavid du Colombier while (c != '\n');
734*0b459c2cSDavid du Colombier }
735*0b459c2cSDavid du Colombier
736*0b459c2cSDavid du Colombier say ("--------------------------\n");
737*0b459c2cSDavid du Colombier }
738*0b459c2cSDavid du Colombier else
739*0b459c2cSDavid du Colombier Fseek (i, file_pos, SEEK_SET);
740*0b459c2cSDavid du Colombier p_input_line = file_line - 1;
741*0b459c2cSDavid du Colombier }
742*0b459c2cSDavid du Colombier
743*0b459c2cSDavid du Colombier /* Make this a function for better debugging. */
744*0b459c2cSDavid du Colombier static void
malformed()745*0b459c2cSDavid du Colombier malformed ()
746*0b459c2cSDavid du Colombier {
747*0b459c2cSDavid du Colombier fatal ("malformed patch at line %ld: %s", p_input_line, buf);
748*0b459c2cSDavid du Colombier /* about as informative as "Syntax error" in C */
749*0b459c2cSDavid du Colombier }
750*0b459c2cSDavid du Colombier
751*0b459c2cSDavid du Colombier /* 1 if there is more of the current diff listing to process;
752*0b459c2cSDavid du Colombier 0 if not; -1 if ran out of memory. */
753*0b459c2cSDavid du Colombier
754*0b459c2cSDavid du Colombier int
another_hunk(difftype,rev)755*0b459c2cSDavid du Colombier another_hunk (difftype, rev)
756*0b459c2cSDavid du Colombier enum diff difftype;
757*0b459c2cSDavid du Colombier int rev;
758*0b459c2cSDavid du Colombier {
759*0b459c2cSDavid du Colombier register char *s;
760*0b459c2cSDavid du Colombier register LINENUM context = 0;
761*0b459c2cSDavid du Colombier register size_t chars_read;
762*0b459c2cSDavid du Colombier
763*0b459c2cSDavid du Colombier while (p_end >= 0) {
764*0b459c2cSDavid du Colombier if (p_end == p_efake)
765*0b459c2cSDavid du Colombier p_end = p_bfake; /* don't free twice */
766*0b459c2cSDavid du Colombier else
767*0b459c2cSDavid du Colombier free(p_line[p_end]);
768*0b459c2cSDavid du Colombier p_end--;
769*0b459c2cSDavid du Colombier }
770*0b459c2cSDavid du Colombier assert(p_end == -1);
771*0b459c2cSDavid du Colombier p_efake = -1;
772*0b459c2cSDavid du Colombier
773*0b459c2cSDavid du Colombier p_max = hunkmax; /* gets reduced when --- found */
774*0b459c2cSDavid du Colombier if (difftype == CONTEXT_DIFF || difftype == NEW_CONTEXT_DIFF) {
775*0b459c2cSDavid du Colombier file_offset line_beginning = file_tell (pfp);
776*0b459c2cSDavid du Colombier /* file pos of the current line */
777*0b459c2cSDavid du Colombier LINENUM repl_beginning = 0; /* index of --- line */
778*0b459c2cSDavid du Colombier register LINENUM fillcnt = 0; /* #lines of missing ptrn or repl */
779*0b459c2cSDavid du Colombier register LINENUM fillsrc; /* index of first line to copy */
780*0b459c2cSDavid du Colombier register LINENUM filldst; /* index of first missing line */
781*0b459c2cSDavid du Colombier bool ptrn_spaces_eaten = FALSE; /* ptrn was slightly misformed */
782*0b459c2cSDavid du Colombier bool some_context = FALSE; /* (perhaps internal) context seen */
783*0b459c2cSDavid du Colombier register bool repl_could_be_missing = TRUE;
784*0b459c2cSDavid du Colombier bool repl_missing = FALSE; /* we are now backtracking */
785*0b459c2cSDavid du Colombier file_offset repl_backtrack_position = 0;
786*0b459c2cSDavid du Colombier /* file pos of first repl line */
787*0b459c2cSDavid du Colombier LINENUM repl_patch_line; /* input line number for same */
788*0b459c2cSDavid du Colombier LINENUM repl_context; /* context for same */
789*0b459c2cSDavid du Colombier LINENUM ptrn_prefix_context = -1; /* lines in pattern prefix context */
790*0b459c2cSDavid du Colombier LINENUM ptrn_suffix_context = -1; /* lines in pattern suffix context */
791*0b459c2cSDavid du Colombier LINENUM repl_prefix_context = -1; /* lines in replac. prefix context */
792*0b459c2cSDavid du Colombier register LINENUM ptrn_copiable = 0;
793*0b459c2cSDavid du Colombier /* # of copiable lines in ptrn */
794*0b459c2cSDavid du Colombier
795*0b459c2cSDavid du Colombier /* Pacify `gcc -Wall'. */
796*0b459c2cSDavid du Colombier fillsrc = filldst = repl_patch_line = repl_context = 0;
797*0b459c2cSDavid du Colombier
798*0b459c2cSDavid du Colombier chars_read = get_line ();
799*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1
800*0b459c2cSDavid du Colombier || chars_read <= 8
801*0b459c2cSDavid du Colombier || strncmp (buf, "********", 8) != 0) {
802*0b459c2cSDavid du Colombier next_intuit_at(line_beginning,p_input_line);
803*0b459c2cSDavid du Colombier return chars_read == (size_t) -1 ? -1 : 0;
804*0b459c2cSDavid du Colombier }
805*0b459c2cSDavid du Colombier p_hunk_beg = p_input_line + 1;
806*0b459c2cSDavid du Colombier while (p_end < p_max) {
807*0b459c2cSDavid du Colombier chars_read = get_line ();
808*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1)
809*0b459c2cSDavid du Colombier return -1;
810*0b459c2cSDavid du Colombier if (!chars_read) {
811*0b459c2cSDavid du Colombier if (repl_beginning && repl_could_be_missing) {
812*0b459c2cSDavid du Colombier repl_missing = TRUE;
813*0b459c2cSDavid du Colombier goto hunk_done;
814*0b459c2cSDavid du Colombier }
815*0b459c2cSDavid du Colombier if (p_max - p_end < 4) {
816*0b459c2cSDavid du Colombier strcpy (buf, " \n"); /* assume blank lines got chopped */
817*0b459c2cSDavid du Colombier chars_read = 3;
818*0b459c2cSDavid du Colombier } else {
819*0b459c2cSDavid du Colombier fatal ("unexpected end of file in patch");
820*0b459c2cSDavid du Colombier }
821*0b459c2cSDavid du Colombier }
822*0b459c2cSDavid du Colombier p_end++;
823*0b459c2cSDavid du Colombier if (p_end == hunkmax)
824*0b459c2cSDavid du Colombier fatal ("unterminated hunk starting at line %ld; giving up at line %ld: %s",
825*0b459c2cSDavid du Colombier pch_hunk_beg (), p_input_line, buf);
826*0b459c2cSDavid du Colombier assert(p_end < hunkmax);
827*0b459c2cSDavid du Colombier p_Char[p_end] = *buf;
828*0b459c2cSDavid du Colombier p_len[p_end] = 0;
829*0b459c2cSDavid du Colombier p_line[p_end] = 0;
830*0b459c2cSDavid du Colombier switch (*buf) {
831*0b459c2cSDavid du Colombier case '*':
832*0b459c2cSDavid du Colombier if (strnEQ(buf, "********", 8)) {
833*0b459c2cSDavid du Colombier if (repl_beginning && repl_could_be_missing) {
834*0b459c2cSDavid du Colombier repl_missing = TRUE;
835*0b459c2cSDavid du Colombier goto hunk_done;
836*0b459c2cSDavid du Colombier }
837*0b459c2cSDavid du Colombier else
838*0b459c2cSDavid du Colombier fatal ("unexpected end of hunk at line %ld",
839*0b459c2cSDavid du Colombier p_input_line);
840*0b459c2cSDavid du Colombier }
841*0b459c2cSDavid du Colombier if (p_end != 0) {
842*0b459c2cSDavid du Colombier if (repl_beginning && repl_could_be_missing) {
843*0b459c2cSDavid du Colombier repl_missing = TRUE;
844*0b459c2cSDavid du Colombier goto hunk_done;
845*0b459c2cSDavid du Colombier }
846*0b459c2cSDavid du Colombier fatal ("unexpected `***' at line %ld: %s",
847*0b459c2cSDavid du Colombier p_input_line, buf);
848*0b459c2cSDavid du Colombier }
849*0b459c2cSDavid du Colombier context = 0;
850*0b459c2cSDavid du Colombier p_len[p_end] = strlen (buf);
851*0b459c2cSDavid du Colombier if (! (p_line[p_end] = savestr (buf))) {
852*0b459c2cSDavid du Colombier p_end--;
853*0b459c2cSDavid du Colombier return -1;
854*0b459c2cSDavid du Colombier }
855*0b459c2cSDavid du Colombier for (s = buf; *s && !ISDIGIT (*s); s++)
856*0b459c2cSDavid du Colombier continue;
857*0b459c2cSDavid du Colombier if (!*s)
858*0b459c2cSDavid du Colombier malformed ();
859*0b459c2cSDavid du Colombier if (strnEQ(s,"0,0",3))
860*0b459c2cSDavid du Colombier remove_prefix (s, 2);
861*0b459c2cSDavid du Colombier p_first = (LINENUM) atol(s);
862*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
863*0b459c2cSDavid du Colombier s++;
864*0b459c2cSDavid du Colombier if (*s == ',') {
865*0b459c2cSDavid du Colombier while (*s && !ISDIGIT (*s))
866*0b459c2cSDavid du Colombier s++;
867*0b459c2cSDavid du Colombier if (!*s)
868*0b459c2cSDavid du Colombier malformed ();
869*0b459c2cSDavid du Colombier p_ptrn_lines = ((LINENUM)atol(s)) - p_first + 1;
870*0b459c2cSDavid du Colombier }
871*0b459c2cSDavid du Colombier else if (p_first)
872*0b459c2cSDavid du Colombier p_ptrn_lines = 1;
873*0b459c2cSDavid du Colombier else {
874*0b459c2cSDavid du Colombier p_ptrn_lines = 0;
875*0b459c2cSDavid du Colombier p_first = 1;
876*0b459c2cSDavid du Colombier }
877*0b459c2cSDavid du Colombier p_max = p_ptrn_lines + 6; /* we need this much at least */
878*0b459c2cSDavid du Colombier while (p_max >= hunkmax)
879*0b459c2cSDavid du Colombier if (! grow_hunkmax ())
880*0b459c2cSDavid du Colombier return -1;
881*0b459c2cSDavid du Colombier p_max = hunkmax;
882*0b459c2cSDavid du Colombier break;
883*0b459c2cSDavid du Colombier case '-':
884*0b459c2cSDavid du Colombier if (buf[1] != '-')
885*0b459c2cSDavid du Colombier goto change_line;
886*0b459c2cSDavid du Colombier if (ptrn_prefix_context == -1)
887*0b459c2cSDavid du Colombier ptrn_prefix_context = context;
888*0b459c2cSDavid du Colombier ptrn_suffix_context = context;
889*0b459c2cSDavid du Colombier if (repl_beginning
890*0b459c2cSDavid du Colombier || (p_end
891*0b459c2cSDavid du Colombier != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n')))
892*0b459c2cSDavid du Colombier {
893*0b459c2cSDavid du Colombier if (p_end == 1)
894*0b459c2cSDavid du Colombier {
895*0b459c2cSDavid du Colombier /* `Old' lines were omitted. Set up to fill
896*0b459c2cSDavid du Colombier them in from `new' context lines. */
897*0b459c2cSDavid du Colombier p_end = p_ptrn_lines + 1;
898*0b459c2cSDavid du Colombier ptrn_prefix_context = ptrn_suffix_context = -1;
899*0b459c2cSDavid du Colombier fillsrc = p_end + 1;
900*0b459c2cSDavid du Colombier filldst = 1;
901*0b459c2cSDavid du Colombier fillcnt = p_ptrn_lines;
902*0b459c2cSDavid du Colombier }
903*0b459c2cSDavid du Colombier else if (! repl_beginning)
904*0b459c2cSDavid du Colombier fatal ("%s `---' at line %ld; check line numbers at line %ld",
905*0b459c2cSDavid du Colombier (p_end <= p_ptrn_lines
906*0b459c2cSDavid du Colombier ? "Premature"
907*0b459c2cSDavid du Colombier : "Overdue"),
908*0b459c2cSDavid du Colombier p_input_line, p_hunk_beg);
909*0b459c2cSDavid du Colombier else if (! repl_could_be_missing)
910*0b459c2cSDavid du Colombier fatal ("duplicate `---' at line %ld; check line numbers at line %ld",
911*0b459c2cSDavid du Colombier p_input_line, p_hunk_beg + repl_beginning);
912*0b459c2cSDavid du Colombier else
913*0b459c2cSDavid du Colombier {
914*0b459c2cSDavid du Colombier repl_missing = TRUE;
915*0b459c2cSDavid du Colombier goto hunk_done;
916*0b459c2cSDavid du Colombier }
917*0b459c2cSDavid du Colombier }
918*0b459c2cSDavid du Colombier repl_beginning = p_end;
919*0b459c2cSDavid du Colombier repl_backtrack_position = file_tell (pfp);
920*0b459c2cSDavid du Colombier repl_patch_line = p_input_line;
921*0b459c2cSDavid du Colombier repl_context = context;
922*0b459c2cSDavid du Colombier p_len[p_end] = strlen (buf);
923*0b459c2cSDavid du Colombier if (! (p_line[p_end] = savestr (buf)))
924*0b459c2cSDavid du Colombier {
925*0b459c2cSDavid du Colombier p_end--;
926*0b459c2cSDavid du Colombier return -1;
927*0b459c2cSDavid du Colombier }
928*0b459c2cSDavid du Colombier p_Char[p_end] = '=';
929*0b459c2cSDavid du Colombier for (s = buf; *s && ! ISDIGIT (*s); s++)
930*0b459c2cSDavid du Colombier continue;
931*0b459c2cSDavid du Colombier if (!*s)
932*0b459c2cSDavid du Colombier malformed ();
933*0b459c2cSDavid du Colombier p_newfirst = (LINENUM) atol (s);
934*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
935*0b459c2cSDavid du Colombier s++;
936*0b459c2cSDavid du Colombier if (*s == ',')
937*0b459c2cSDavid du Colombier {
938*0b459c2cSDavid du Colombier do
939*0b459c2cSDavid du Colombier {
940*0b459c2cSDavid du Colombier if (!*++s)
941*0b459c2cSDavid du Colombier malformed ();
942*0b459c2cSDavid du Colombier }
943*0b459c2cSDavid du Colombier while (! ISDIGIT (*s));
944*0b459c2cSDavid du Colombier p_repl_lines = (LINENUM) atol (s) - p_newfirst + 1;
945*0b459c2cSDavid du Colombier }
946*0b459c2cSDavid du Colombier else if (p_newfirst)
947*0b459c2cSDavid du Colombier p_repl_lines = 1;
948*0b459c2cSDavid du Colombier else
949*0b459c2cSDavid du Colombier {
950*0b459c2cSDavid du Colombier p_repl_lines = 0;
951*0b459c2cSDavid du Colombier p_newfirst = 1;
952*0b459c2cSDavid du Colombier }
953*0b459c2cSDavid du Colombier p_max = p_repl_lines + p_end;
954*0b459c2cSDavid du Colombier while (p_max >= hunkmax)
955*0b459c2cSDavid du Colombier if (! grow_hunkmax ())
956*0b459c2cSDavid du Colombier return -1;
957*0b459c2cSDavid du Colombier if (p_repl_lines != ptrn_copiable
958*0b459c2cSDavid du Colombier && (p_prefix_context != 0
959*0b459c2cSDavid du Colombier || context != 0
960*0b459c2cSDavid du Colombier || p_repl_lines != 1))
961*0b459c2cSDavid du Colombier repl_could_be_missing = FALSE;
962*0b459c2cSDavid du Colombier context = 0;
963*0b459c2cSDavid du Colombier break;
964*0b459c2cSDavid du Colombier case '+': case '!':
965*0b459c2cSDavid du Colombier repl_could_be_missing = FALSE;
966*0b459c2cSDavid du Colombier change_line:
967*0b459c2cSDavid du Colombier s = buf + 1;
968*0b459c2cSDavid du Colombier chars_read--;
969*0b459c2cSDavid du Colombier if (*s == '\n' && canonicalize) {
970*0b459c2cSDavid du Colombier strcpy (s, " \n");
971*0b459c2cSDavid du Colombier chars_read = 2;
972*0b459c2cSDavid du Colombier }
973*0b459c2cSDavid du Colombier if (*s == ' ' || *s == '\t') {
974*0b459c2cSDavid du Colombier s++;
975*0b459c2cSDavid du Colombier chars_read--;
976*0b459c2cSDavid du Colombier } else if (repl_beginning && repl_could_be_missing) {
977*0b459c2cSDavid du Colombier repl_missing = TRUE;
978*0b459c2cSDavid du Colombier goto hunk_done;
979*0b459c2cSDavid du Colombier }
980*0b459c2cSDavid du Colombier if (! repl_beginning)
981*0b459c2cSDavid du Colombier {
982*0b459c2cSDavid du Colombier if (ptrn_prefix_context == -1)
983*0b459c2cSDavid du Colombier ptrn_prefix_context = context;
984*0b459c2cSDavid du Colombier }
985*0b459c2cSDavid du Colombier else
986*0b459c2cSDavid du Colombier {
987*0b459c2cSDavid du Colombier if (repl_prefix_context == -1)
988*0b459c2cSDavid du Colombier repl_prefix_context = context;
989*0b459c2cSDavid du Colombier }
990*0b459c2cSDavid du Colombier chars_read -=
991*0b459c2cSDavid du Colombier (1 < chars_read
992*0b459c2cSDavid du Colombier && p_end == (repl_beginning ? p_max : p_ptrn_lines)
993*0b459c2cSDavid du Colombier && incomplete_line ());
994*0b459c2cSDavid du Colombier p_len[p_end] = chars_read;
995*0b459c2cSDavid du Colombier if (! (p_line[p_end] = savebuf (s, chars_read))) {
996*0b459c2cSDavid du Colombier p_end--;
997*0b459c2cSDavid du Colombier return -1;
998*0b459c2cSDavid du Colombier }
999*0b459c2cSDavid du Colombier context = 0;
1000*0b459c2cSDavid du Colombier break;
1001*0b459c2cSDavid du Colombier case '\t': case '\n': /* assume spaces got eaten */
1002*0b459c2cSDavid du Colombier s = buf;
1003*0b459c2cSDavid du Colombier if (*buf == '\t') {
1004*0b459c2cSDavid du Colombier s++;
1005*0b459c2cSDavid du Colombier chars_read--;
1006*0b459c2cSDavid du Colombier }
1007*0b459c2cSDavid du Colombier if (repl_beginning && repl_could_be_missing &&
1008*0b459c2cSDavid du Colombier (!ptrn_spaces_eaten || difftype == NEW_CONTEXT_DIFF) ) {
1009*0b459c2cSDavid du Colombier repl_missing = TRUE;
1010*0b459c2cSDavid du Colombier goto hunk_done;
1011*0b459c2cSDavid du Colombier }
1012*0b459c2cSDavid du Colombier chars_read -=
1013*0b459c2cSDavid du Colombier (1 < chars_read
1014*0b459c2cSDavid du Colombier && p_end == (repl_beginning ? p_max : p_ptrn_lines)
1015*0b459c2cSDavid du Colombier && incomplete_line ());
1016*0b459c2cSDavid du Colombier p_len[p_end] = chars_read;
1017*0b459c2cSDavid du Colombier if (! (p_line[p_end] = savebuf (buf, chars_read))) {
1018*0b459c2cSDavid du Colombier p_end--;
1019*0b459c2cSDavid du Colombier return -1;
1020*0b459c2cSDavid du Colombier }
1021*0b459c2cSDavid du Colombier if (p_end != p_ptrn_lines + 1) {
1022*0b459c2cSDavid du Colombier ptrn_spaces_eaten |= (repl_beginning != 0);
1023*0b459c2cSDavid du Colombier some_context = TRUE;
1024*0b459c2cSDavid du Colombier context++;
1025*0b459c2cSDavid du Colombier if (!repl_beginning)
1026*0b459c2cSDavid du Colombier ptrn_copiable++;
1027*0b459c2cSDavid du Colombier p_Char[p_end] = ' ';
1028*0b459c2cSDavid du Colombier }
1029*0b459c2cSDavid du Colombier break;
1030*0b459c2cSDavid du Colombier case ' ':
1031*0b459c2cSDavid du Colombier s = buf + 1;
1032*0b459c2cSDavid du Colombier chars_read--;
1033*0b459c2cSDavid du Colombier if (*s == '\n' && canonicalize) {
1034*0b459c2cSDavid du Colombier strcpy (s, "\n");
1035*0b459c2cSDavid du Colombier chars_read = 2;
1036*0b459c2cSDavid du Colombier }
1037*0b459c2cSDavid du Colombier if (*s == ' ' || *s == '\t') {
1038*0b459c2cSDavid du Colombier s++;
1039*0b459c2cSDavid du Colombier chars_read--;
1040*0b459c2cSDavid du Colombier } else if (repl_beginning && repl_could_be_missing) {
1041*0b459c2cSDavid du Colombier repl_missing = TRUE;
1042*0b459c2cSDavid du Colombier goto hunk_done;
1043*0b459c2cSDavid du Colombier }
1044*0b459c2cSDavid du Colombier some_context = TRUE;
1045*0b459c2cSDavid du Colombier context++;
1046*0b459c2cSDavid du Colombier if (!repl_beginning)
1047*0b459c2cSDavid du Colombier ptrn_copiable++;
1048*0b459c2cSDavid du Colombier chars_read -=
1049*0b459c2cSDavid du Colombier (1 < chars_read
1050*0b459c2cSDavid du Colombier && p_end == (repl_beginning ? p_max : p_ptrn_lines)
1051*0b459c2cSDavid du Colombier && incomplete_line ());
1052*0b459c2cSDavid du Colombier p_len[p_end] = chars_read;
1053*0b459c2cSDavid du Colombier if (! (p_line[p_end] = savebuf (buf + 2, chars_read))) {
1054*0b459c2cSDavid du Colombier p_end--;
1055*0b459c2cSDavid du Colombier return -1;
1056*0b459c2cSDavid du Colombier }
1057*0b459c2cSDavid du Colombier break;
1058*0b459c2cSDavid du Colombier default:
1059*0b459c2cSDavid du Colombier if (repl_beginning && repl_could_be_missing) {
1060*0b459c2cSDavid du Colombier repl_missing = TRUE;
1061*0b459c2cSDavid du Colombier goto hunk_done;
1062*0b459c2cSDavid du Colombier }
1063*0b459c2cSDavid du Colombier malformed ();
1064*0b459c2cSDavid du Colombier }
1065*0b459c2cSDavid du Colombier }
1066*0b459c2cSDavid du Colombier
1067*0b459c2cSDavid du Colombier hunk_done:
1068*0b459c2cSDavid du Colombier if (p_end >=0 && !repl_beginning)
1069*0b459c2cSDavid du Colombier fatal ("no `---' found in patch at line %ld", pch_hunk_beg ());
1070*0b459c2cSDavid du Colombier
1071*0b459c2cSDavid du Colombier if (repl_missing) {
1072*0b459c2cSDavid du Colombier
1073*0b459c2cSDavid du Colombier /* reset state back to just after --- */
1074*0b459c2cSDavid du Colombier p_input_line = repl_patch_line;
1075*0b459c2cSDavid du Colombier context = repl_context;
1076*0b459c2cSDavid du Colombier for (p_end--; p_end > repl_beginning; p_end--)
1077*0b459c2cSDavid du Colombier free(p_line[p_end]);
1078*0b459c2cSDavid du Colombier Fseek (pfp, repl_backtrack_position, SEEK_SET);
1079*0b459c2cSDavid du Colombier
1080*0b459c2cSDavid du Colombier /* redundant 'new' context lines were omitted - set */
1081*0b459c2cSDavid du Colombier /* up to fill them in from the old file context */
1082*0b459c2cSDavid du Colombier fillsrc = 1;
1083*0b459c2cSDavid du Colombier filldst = repl_beginning+1;
1084*0b459c2cSDavid du Colombier fillcnt = p_repl_lines;
1085*0b459c2cSDavid du Colombier p_end = p_max;
1086*0b459c2cSDavid du Colombier }
1087*0b459c2cSDavid du Colombier else if (!some_context && fillcnt == 1) {
1088*0b459c2cSDavid du Colombier /* the first hunk was a null hunk with no context */
1089*0b459c2cSDavid du Colombier /* and we were expecting one line -- fix it up. */
1090*0b459c2cSDavid du Colombier while (filldst < p_end) {
1091*0b459c2cSDavid du Colombier p_line[filldst] = p_line[filldst+1];
1092*0b459c2cSDavid du Colombier p_Char[filldst] = p_Char[filldst+1];
1093*0b459c2cSDavid du Colombier p_len[filldst] = p_len[filldst+1];
1094*0b459c2cSDavid du Colombier filldst++;
1095*0b459c2cSDavid du Colombier }
1096*0b459c2cSDavid du Colombier #if 0
1097*0b459c2cSDavid du Colombier repl_beginning--; /* this doesn't need to be fixed */
1098*0b459c2cSDavid du Colombier #endif
1099*0b459c2cSDavid du Colombier p_end--;
1100*0b459c2cSDavid du Colombier p_first++; /* do append rather than insert */
1101*0b459c2cSDavid du Colombier fillcnt = 0;
1102*0b459c2cSDavid du Colombier p_ptrn_lines = 0;
1103*0b459c2cSDavid du Colombier }
1104*0b459c2cSDavid du Colombier
1105*0b459c2cSDavid du Colombier p_prefix_context = ((repl_prefix_context == -1
1106*0b459c2cSDavid du Colombier || (ptrn_prefix_context != -1
1107*0b459c2cSDavid du Colombier && ptrn_prefix_context < repl_prefix_context))
1108*0b459c2cSDavid du Colombier ? ptrn_prefix_context : repl_prefix_context);
1109*0b459c2cSDavid du Colombier p_suffix_context = ((ptrn_suffix_context != -1
1110*0b459c2cSDavid du Colombier && ptrn_suffix_context < context)
1111*0b459c2cSDavid du Colombier ? ptrn_suffix_context : context);
1112*0b459c2cSDavid du Colombier assert (p_prefix_context != -1 && p_suffix_context != -1);
1113*0b459c2cSDavid du Colombier
1114*0b459c2cSDavid du Colombier if (difftype == CONTEXT_DIFF
1115*0b459c2cSDavid du Colombier && (fillcnt
1116*0b459c2cSDavid du Colombier || (p_first > 1
1117*0b459c2cSDavid du Colombier && p_prefix_context + p_suffix_context < ptrn_copiable))) {
1118*0b459c2cSDavid du Colombier if (verbosity == VERBOSE)
1119*0b459c2cSDavid du Colombier say ("%s\n%s\n%s\n",
1120*0b459c2cSDavid du Colombier "(Fascinating -- this is really a new-style context diff but without",
1121*0b459c2cSDavid du Colombier "the telltale extra asterisks on the *** line that usually indicate",
1122*0b459c2cSDavid du Colombier "the new style...)");
1123*0b459c2cSDavid du Colombier diff_type = difftype = NEW_CONTEXT_DIFF;
1124*0b459c2cSDavid du Colombier }
1125*0b459c2cSDavid du Colombier
1126*0b459c2cSDavid du Colombier /* if there were omitted context lines, fill them in now */
1127*0b459c2cSDavid du Colombier if (fillcnt) {
1128*0b459c2cSDavid du Colombier p_bfake = filldst; /* remember where not to free() */
1129*0b459c2cSDavid du Colombier p_efake = filldst + fillcnt - 1;
1130*0b459c2cSDavid du Colombier while (fillcnt-- > 0) {
1131*0b459c2cSDavid du Colombier while (fillsrc <= p_end && fillsrc != repl_beginning
1132*0b459c2cSDavid du Colombier && p_Char[fillsrc] != ' ')
1133*0b459c2cSDavid du Colombier fillsrc++;
1134*0b459c2cSDavid du Colombier if (p_end < fillsrc || fillsrc == repl_beginning)
1135*0b459c2cSDavid du Colombier fatal ("replacement text or line numbers mangled in hunk at line %ld",
1136*0b459c2cSDavid du Colombier p_hunk_beg);
1137*0b459c2cSDavid du Colombier p_line[filldst] = p_line[fillsrc];
1138*0b459c2cSDavid du Colombier p_Char[filldst] = p_Char[fillsrc];
1139*0b459c2cSDavid du Colombier p_len[filldst] = p_len[fillsrc];
1140*0b459c2cSDavid du Colombier fillsrc++; filldst++;
1141*0b459c2cSDavid du Colombier }
1142*0b459c2cSDavid du Colombier while (fillsrc <= p_end && fillsrc != repl_beginning)
1143*0b459c2cSDavid du Colombier {
1144*0b459c2cSDavid du Colombier if (p_Char[fillsrc] == ' ')
1145*0b459c2cSDavid du Colombier fatal ("replacement text or line numbers mangled in hunk at line %ld",
1146*0b459c2cSDavid du Colombier p_hunk_beg);
1147*0b459c2cSDavid du Colombier fillsrc++;
1148*0b459c2cSDavid du Colombier }
1149*0b459c2cSDavid du Colombier if (debug & 64)
1150*0b459c2cSDavid du Colombier printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n",
1151*0b459c2cSDavid du Colombier fillsrc,filldst,repl_beginning,p_end+1);
1152*0b459c2cSDavid du Colombier assert(fillsrc==p_end+1 || fillsrc==repl_beginning);
1153*0b459c2cSDavid du Colombier assert(filldst==p_end+1 || filldst==repl_beginning);
1154*0b459c2cSDavid du Colombier }
1155*0b459c2cSDavid du Colombier }
1156*0b459c2cSDavid du Colombier else if (difftype == UNI_DIFF) {
1157*0b459c2cSDavid du Colombier file_offset line_beginning = file_tell (pfp);
1158*0b459c2cSDavid du Colombier /* file pos of the current line */
1159*0b459c2cSDavid du Colombier register LINENUM fillsrc; /* index of old lines */
1160*0b459c2cSDavid du Colombier register LINENUM filldst; /* index of new lines */
1161*0b459c2cSDavid du Colombier char ch = '\0';
1162*0b459c2cSDavid du Colombier
1163*0b459c2cSDavid du Colombier chars_read = get_line ();
1164*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1
1165*0b459c2cSDavid du Colombier || chars_read <= 4
1166*0b459c2cSDavid du Colombier || strncmp (buf, "@@ -", 4) != 0) {
1167*0b459c2cSDavid du Colombier next_intuit_at(line_beginning,p_input_line);
1168*0b459c2cSDavid du Colombier return chars_read == (size_t) -1 ? -1 : 0;
1169*0b459c2cSDavid du Colombier }
1170*0b459c2cSDavid du Colombier s = buf+4;
1171*0b459c2cSDavid du Colombier if (!*s)
1172*0b459c2cSDavid du Colombier malformed ();
1173*0b459c2cSDavid du Colombier p_first = (LINENUM) atol(s);
1174*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
1175*0b459c2cSDavid du Colombier s++;
1176*0b459c2cSDavid du Colombier if (*s == ',') {
1177*0b459c2cSDavid du Colombier p_ptrn_lines = (LINENUM) atol(++s);
1178*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
1179*0b459c2cSDavid du Colombier s++;
1180*0b459c2cSDavid du Colombier } else
1181*0b459c2cSDavid du Colombier p_ptrn_lines = 1;
1182*0b459c2cSDavid du Colombier if (*s == ' ') s++;
1183*0b459c2cSDavid du Colombier if (*s != '+' || !*++s)
1184*0b459c2cSDavid du Colombier malformed ();
1185*0b459c2cSDavid du Colombier p_newfirst = (LINENUM) atol(s);
1186*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
1187*0b459c2cSDavid du Colombier s++;
1188*0b459c2cSDavid du Colombier if (*s == ',') {
1189*0b459c2cSDavid du Colombier p_repl_lines = (LINENUM) atol(++s);
1190*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
1191*0b459c2cSDavid du Colombier s++;
1192*0b459c2cSDavid du Colombier } else
1193*0b459c2cSDavid du Colombier p_repl_lines = 1;
1194*0b459c2cSDavid du Colombier if (*s == ' ') s++;
1195*0b459c2cSDavid du Colombier if (*s != '@')
1196*0b459c2cSDavid du Colombier malformed ();
1197*0b459c2cSDavid du Colombier if (!p_ptrn_lines)
1198*0b459c2cSDavid du Colombier p_first++; /* do append rather than insert */
1199*0b459c2cSDavid du Colombier if (!p_repl_lines)
1200*0b459c2cSDavid du Colombier p_newfirst++;
1201*0b459c2cSDavid du Colombier p_max = p_ptrn_lines + p_repl_lines + 1;
1202*0b459c2cSDavid du Colombier while (p_max >= hunkmax)
1203*0b459c2cSDavid du Colombier if (! grow_hunkmax ())
1204*0b459c2cSDavid du Colombier return -1;
1205*0b459c2cSDavid du Colombier fillsrc = 1;
1206*0b459c2cSDavid du Colombier filldst = fillsrc + p_ptrn_lines;
1207*0b459c2cSDavid du Colombier p_end = filldst + p_repl_lines;
1208*0b459c2cSDavid du Colombier sprintf (buf,"*** %ld,%ld ****\n",p_first,p_first + p_ptrn_lines - 1);
1209*0b459c2cSDavid du Colombier p_len[0] = strlen (buf);
1210*0b459c2cSDavid du Colombier if (! (p_line[0] = savestr (buf))) {
1211*0b459c2cSDavid du Colombier p_end = -1;
1212*0b459c2cSDavid du Colombier return -1;
1213*0b459c2cSDavid du Colombier }
1214*0b459c2cSDavid du Colombier p_Char[0] = '*';
1215*0b459c2cSDavid du Colombier sprintf (buf,"--- %ld,%ld ----\n",p_newfirst,p_newfirst+p_repl_lines-1);
1216*0b459c2cSDavid du Colombier p_len[filldst] = strlen (buf);
1217*0b459c2cSDavid du Colombier if (! (p_line[filldst] = savestr (buf))) {
1218*0b459c2cSDavid du Colombier p_end = 0;
1219*0b459c2cSDavid du Colombier return -1;
1220*0b459c2cSDavid du Colombier }
1221*0b459c2cSDavid du Colombier p_Char[filldst++] = '=';
1222*0b459c2cSDavid du Colombier p_prefix_context = -1;
1223*0b459c2cSDavid du Colombier p_hunk_beg = p_input_line + 1;
1224*0b459c2cSDavid du Colombier while (fillsrc <= p_ptrn_lines || filldst <= p_end) {
1225*0b459c2cSDavid du Colombier chars_read = get_line ();
1226*0b459c2cSDavid du Colombier if (!chars_read) {
1227*0b459c2cSDavid du Colombier if (p_max - filldst < 3) {
1228*0b459c2cSDavid du Colombier strcpy (buf, " \n"); /* assume blank lines got chopped */
1229*0b459c2cSDavid du Colombier chars_read = 2;
1230*0b459c2cSDavid du Colombier } else {
1231*0b459c2cSDavid du Colombier fatal ("unexpected end of file in patch");
1232*0b459c2cSDavid du Colombier }
1233*0b459c2cSDavid du Colombier }
1234*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1)
1235*0b459c2cSDavid du Colombier s = 0;
1236*0b459c2cSDavid du Colombier else if (*buf == '\t' || *buf == '\n') {
1237*0b459c2cSDavid du Colombier ch = ' '; /* assume the space got eaten */
1238*0b459c2cSDavid du Colombier s = savebuf (buf, chars_read);
1239*0b459c2cSDavid du Colombier }
1240*0b459c2cSDavid du Colombier else {
1241*0b459c2cSDavid du Colombier ch = *buf;
1242*0b459c2cSDavid du Colombier s = savebuf (buf+1, --chars_read);
1243*0b459c2cSDavid du Colombier }
1244*0b459c2cSDavid du Colombier if (!s) {
1245*0b459c2cSDavid du Colombier while (--filldst > p_ptrn_lines)
1246*0b459c2cSDavid du Colombier free(p_line[filldst]);
1247*0b459c2cSDavid du Colombier p_end = fillsrc-1;
1248*0b459c2cSDavid du Colombier return -1;
1249*0b459c2cSDavid du Colombier }
1250*0b459c2cSDavid du Colombier switch (ch) {
1251*0b459c2cSDavid du Colombier case '-':
1252*0b459c2cSDavid du Colombier if (fillsrc > p_ptrn_lines) {
1253*0b459c2cSDavid du Colombier free(s);
1254*0b459c2cSDavid du Colombier p_end = filldst-1;
1255*0b459c2cSDavid du Colombier malformed ();
1256*0b459c2cSDavid du Colombier }
1257*0b459c2cSDavid du Colombier chars_read -= fillsrc == p_ptrn_lines && incomplete_line ();
1258*0b459c2cSDavid du Colombier p_Char[fillsrc] = ch;
1259*0b459c2cSDavid du Colombier p_line[fillsrc] = s;
1260*0b459c2cSDavid du Colombier p_len[fillsrc++] = chars_read;
1261*0b459c2cSDavid du Colombier break;
1262*0b459c2cSDavid du Colombier case '=':
1263*0b459c2cSDavid du Colombier ch = ' ';
1264*0b459c2cSDavid du Colombier /* FALL THROUGH */
1265*0b459c2cSDavid du Colombier case ' ':
1266*0b459c2cSDavid du Colombier if (fillsrc > p_ptrn_lines) {
1267*0b459c2cSDavid du Colombier free(s);
1268*0b459c2cSDavid du Colombier while (--filldst > p_ptrn_lines)
1269*0b459c2cSDavid du Colombier free(p_line[filldst]);
1270*0b459c2cSDavid du Colombier p_end = fillsrc-1;
1271*0b459c2cSDavid du Colombier malformed ();
1272*0b459c2cSDavid du Colombier }
1273*0b459c2cSDavid du Colombier context++;
1274*0b459c2cSDavid du Colombier chars_read -= fillsrc == p_ptrn_lines && incomplete_line ();
1275*0b459c2cSDavid du Colombier p_Char[fillsrc] = ch;
1276*0b459c2cSDavid du Colombier p_line[fillsrc] = s;
1277*0b459c2cSDavid du Colombier p_len[fillsrc++] = chars_read;
1278*0b459c2cSDavid du Colombier s = savebuf (s, chars_read);
1279*0b459c2cSDavid du Colombier if (!s) {
1280*0b459c2cSDavid du Colombier while (--filldst > p_ptrn_lines)
1281*0b459c2cSDavid du Colombier free(p_line[filldst]);
1282*0b459c2cSDavid du Colombier p_end = fillsrc-1;
1283*0b459c2cSDavid du Colombier return -1;
1284*0b459c2cSDavid du Colombier }
1285*0b459c2cSDavid du Colombier /* FALL THROUGH */
1286*0b459c2cSDavid du Colombier case '+':
1287*0b459c2cSDavid du Colombier if (filldst > p_end) {
1288*0b459c2cSDavid du Colombier free(s);
1289*0b459c2cSDavid du Colombier while (--filldst > p_ptrn_lines)
1290*0b459c2cSDavid du Colombier free(p_line[filldst]);
1291*0b459c2cSDavid du Colombier p_end = fillsrc-1;
1292*0b459c2cSDavid du Colombier malformed ();
1293*0b459c2cSDavid du Colombier }
1294*0b459c2cSDavid du Colombier chars_read -= filldst == p_end && incomplete_line ();
1295*0b459c2cSDavid du Colombier p_Char[filldst] = ch;
1296*0b459c2cSDavid du Colombier p_line[filldst] = s;
1297*0b459c2cSDavid du Colombier p_len[filldst++] = chars_read;
1298*0b459c2cSDavid du Colombier break;
1299*0b459c2cSDavid du Colombier default:
1300*0b459c2cSDavid du Colombier p_end = filldst;
1301*0b459c2cSDavid du Colombier malformed ();
1302*0b459c2cSDavid du Colombier }
1303*0b459c2cSDavid du Colombier if (ch != ' ') {
1304*0b459c2cSDavid du Colombier if (p_prefix_context == -1)
1305*0b459c2cSDavid du Colombier p_prefix_context = context;
1306*0b459c2cSDavid du Colombier context = 0;
1307*0b459c2cSDavid du Colombier }
1308*0b459c2cSDavid du Colombier }/* while */
1309*0b459c2cSDavid du Colombier if (p_prefix_context == -1)
1310*0b459c2cSDavid du Colombier malformed ();
1311*0b459c2cSDavid du Colombier p_suffix_context = context;
1312*0b459c2cSDavid du Colombier }
1313*0b459c2cSDavid du Colombier else { /* normal diff--fake it up */
1314*0b459c2cSDavid du Colombier char hunk_type;
1315*0b459c2cSDavid du Colombier register int i;
1316*0b459c2cSDavid du Colombier LINENUM min, max;
1317*0b459c2cSDavid du Colombier file_offset line_beginning = file_tell (pfp);
1318*0b459c2cSDavid du Colombier
1319*0b459c2cSDavid du Colombier p_prefix_context = p_suffix_context = 0;
1320*0b459c2cSDavid du Colombier chars_read = get_line ();
1321*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1 || !chars_read || !ISDIGIT (*buf)) {
1322*0b459c2cSDavid du Colombier next_intuit_at(line_beginning,p_input_line);
1323*0b459c2cSDavid du Colombier return chars_read == (size_t) -1 ? -1 : 0;
1324*0b459c2cSDavid du Colombier }
1325*0b459c2cSDavid du Colombier p_first = (LINENUM)atol(buf);
1326*0b459c2cSDavid du Colombier for (s = buf; ISDIGIT (*s); s++)
1327*0b459c2cSDavid du Colombier continue;
1328*0b459c2cSDavid du Colombier if (*s == ',') {
1329*0b459c2cSDavid du Colombier p_ptrn_lines = (LINENUM)atol(++s) - p_first + 1;
1330*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
1331*0b459c2cSDavid du Colombier s++;
1332*0b459c2cSDavid du Colombier }
1333*0b459c2cSDavid du Colombier else
1334*0b459c2cSDavid du Colombier p_ptrn_lines = (*s != 'a');
1335*0b459c2cSDavid du Colombier hunk_type = *s;
1336*0b459c2cSDavid du Colombier if (hunk_type == 'a')
1337*0b459c2cSDavid du Colombier p_first++; /* do append rather than insert */
1338*0b459c2cSDavid du Colombier min = (LINENUM)atol(++s);
1339*0b459c2cSDavid du Colombier while (ISDIGIT (*s))
1340*0b459c2cSDavid du Colombier s++;
1341*0b459c2cSDavid du Colombier if (*s == ',')
1342*0b459c2cSDavid du Colombier max = (LINENUM)atol(++s);
1343*0b459c2cSDavid du Colombier else
1344*0b459c2cSDavid du Colombier max = min;
1345*0b459c2cSDavid du Colombier if (hunk_type == 'd')
1346*0b459c2cSDavid du Colombier min++;
1347*0b459c2cSDavid du Colombier p_end = p_ptrn_lines + 1 + max - min + 1;
1348*0b459c2cSDavid du Colombier while (p_end >= hunkmax)
1349*0b459c2cSDavid du Colombier if (! grow_hunkmax ())
1350*0b459c2cSDavid du Colombier {
1351*0b459c2cSDavid du Colombier p_end = -1;
1352*0b459c2cSDavid du Colombier return -1;
1353*0b459c2cSDavid du Colombier }
1354*0b459c2cSDavid du Colombier p_newfirst = min;
1355*0b459c2cSDavid du Colombier p_repl_lines = max - min + 1;
1356*0b459c2cSDavid du Colombier sprintf (buf, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1);
1357*0b459c2cSDavid du Colombier p_len[0] = strlen (buf);
1358*0b459c2cSDavid du Colombier if (! (p_line[0] = savestr (buf))) {
1359*0b459c2cSDavid du Colombier p_end = -1;
1360*0b459c2cSDavid du Colombier return -1;
1361*0b459c2cSDavid du Colombier }
1362*0b459c2cSDavid du Colombier p_Char[0] = '*';
1363*0b459c2cSDavid du Colombier for (i=1; i<=p_ptrn_lines; i++) {
1364*0b459c2cSDavid du Colombier chars_read = get_line ();
1365*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1)
1366*0b459c2cSDavid du Colombier {
1367*0b459c2cSDavid du Colombier p_end = i - 1;
1368*0b459c2cSDavid du Colombier return -1;
1369*0b459c2cSDavid du Colombier }
1370*0b459c2cSDavid du Colombier if (!chars_read)
1371*0b459c2cSDavid du Colombier fatal ("unexpected end of file in patch at line %ld",
1372*0b459c2cSDavid du Colombier p_input_line);
1373*0b459c2cSDavid du Colombier if (buf[0] != '<' || (buf[1] != ' ' && buf[1] != '\t'))
1374*0b459c2cSDavid du Colombier fatal ("`<' expected at line %ld of patch", p_input_line);
1375*0b459c2cSDavid du Colombier chars_read -= 2 + (i == p_ptrn_lines && incomplete_line ());
1376*0b459c2cSDavid du Colombier p_len[i] = chars_read;
1377*0b459c2cSDavid du Colombier if (! (p_line[i] = savebuf (buf + 2, chars_read))) {
1378*0b459c2cSDavid du Colombier p_end = i-1;
1379*0b459c2cSDavid du Colombier return -1;
1380*0b459c2cSDavid du Colombier }
1381*0b459c2cSDavid du Colombier p_Char[i] = '-';
1382*0b459c2cSDavid du Colombier }
1383*0b459c2cSDavid du Colombier if (hunk_type == 'c') {
1384*0b459c2cSDavid du Colombier chars_read = get_line ();
1385*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1)
1386*0b459c2cSDavid du Colombier {
1387*0b459c2cSDavid du Colombier p_end = i - 1;
1388*0b459c2cSDavid du Colombier return -1;
1389*0b459c2cSDavid du Colombier }
1390*0b459c2cSDavid du Colombier if (! chars_read)
1391*0b459c2cSDavid du Colombier fatal ("unexpected end of file in patch at line %ld",
1392*0b459c2cSDavid du Colombier p_input_line);
1393*0b459c2cSDavid du Colombier if (*buf != '-')
1394*0b459c2cSDavid du Colombier fatal ("`---' expected at line %ld of patch", p_input_line);
1395*0b459c2cSDavid du Colombier }
1396*0b459c2cSDavid du Colombier sprintf (buf, "--- %ld,%ld\n", min, max);
1397*0b459c2cSDavid du Colombier p_len[i] = strlen (buf);
1398*0b459c2cSDavid du Colombier if (! (p_line[i] = savestr (buf))) {
1399*0b459c2cSDavid du Colombier p_end = i-1;
1400*0b459c2cSDavid du Colombier return -1;
1401*0b459c2cSDavid du Colombier }
1402*0b459c2cSDavid du Colombier p_Char[i] = '=';
1403*0b459c2cSDavid du Colombier for (i++; i<=p_end; i++) {
1404*0b459c2cSDavid du Colombier chars_read = get_line ();
1405*0b459c2cSDavid du Colombier if (chars_read == (size_t) -1)
1406*0b459c2cSDavid du Colombier {
1407*0b459c2cSDavid du Colombier p_end = i - 1;
1408*0b459c2cSDavid du Colombier return -1;
1409*0b459c2cSDavid du Colombier }
1410*0b459c2cSDavid du Colombier if (!chars_read)
1411*0b459c2cSDavid du Colombier fatal ("unexpected end of file in patch at line %ld",
1412*0b459c2cSDavid du Colombier p_input_line);
1413*0b459c2cSDavid du Colombier if (buf[0] != '>' || (buf[1] != ' ' && buf[1] != '\t'))
1414*0b459c2cSDavid du Colombier fatal ("`>' expected at line %ld of patch", p_input_line);
1415*0b459c2cSDavid du Colombier chars_read -= 2 + (i == p_end && incomplete_line ());
1416*0b459c2cSDavid du Colombier p_len[i] = chars_read;
1417*0b459c2cSDavid du Colombier if (! (p_line[i] = savebuf (buf + 2, chars_read))) {
1418*0b459c2cSDavid du Colombier p_end = i-1;
1419*0b459c2cSDavid du Colombier return -1;
1420*0b459c2cSDavid du Colombier }
1421*0b459c2cSDavid du Colombier p_Char[i] = '+';
1422*0b459c2cSDavid du Colombier }
1423*0b459c2cSDavid du Colombier }
1424*0b459c2cSDavid du Colombier if (rev) /* backwards patch? */
1425*0b459c2cSDavid du Colombier if (!pch_swap())
1426*0b459c2cSDavid du Colombier say ("Not enough memory to swap next hunk!\n");
1427*0b459c2cSDavid du Colombier if (debug & 2) {
1428*0b459c2cSDavid du Colombier LINENUM i;
1429*0b459c2cSDavid du Colombier char special;
1430*0b459c2cSDavid du Colombier
1431*0b459c2cSDavid du Colombier for (i=0; i <= p_end; i++) {
1432*0b459c2cSDavid du Colombier if (i == p_ptrn_lines)
1433*0b459c2cSDavid du Colombier special = '^';
1434*0b459c2cSDavid du Colombier else
1435*0b459c2cSDavid du Colombier special = ' ';
1436*0b459c2cSDavid du Colombier fprintf (stderr, "%3ld %c %c ", i, p_Char[i], special);
1437*0b459c2cSDavid du Colombier pch_write_line (i, stderr);
1438*0b459c2cSDavid du Colombier fflush (stderr);
1439*0b459c2cSDavid du Colombier }
1440*0b459c2cSDavid du Colombier }
1441*0b459c2cSDavid du Colombier if (p_end+1 < hunkmax) /* paranoia reigns supreme... */
1442*0b459c2cSDavid du Colombier p_Char[p_end+1] = '^'; /* add a stopper for apply_hunk */
1443*0b459c2cSDavid du Colombier return 1;
1444*0b459c2cSDavid du Colombier }
1445*0b459c2cSDavid du Colombier
1446*0b459c2cSDavid du Colombier static size_t
get_line()1447*0b459c2cSDavid du Colombier get_line ()
1448*0b459c2cSDavid du Colombier {
1449*0b459c2cSDavid du Colombier return pget_line (p_indent, p_rfc934_nesting);
1450*0b459c2cSDavid du Colombier }
1451*0b459c2cSDavid du Colombier
1452*0b459c2cSDavid du Colombier /* Input a line from the patch file, worrying about indentation.
1453*0b459c2cSDavid du Colombier Strip up to INDENT characters' worth of leading indentation.
1454*0b459c2cSDavid du Colombier Then remove up to RFC934_NESTING instances of leading "- ".
1455*0b459c2cSDavid du Colombier Ignore any partial lines at end of input, but warn about them.
1456*0b459c2cSDavid du Colombier Succeed if a line was read; it is terminated by "\n\0" for convenience.
1457*0b459c2cSDavid du Colombier Return the number of characters read, including '\n' but not '\0'.
1458*0b459c2cSDavid du Colombier Return -1 if we ran out of memory. */
1459*0b459c2cSDavid du Colombier
1460*0b459c2cSDavid du Colombier static size_t
pget_line(indent,rfc934_nesting)1461*0b459c2cSDavid du Colombier pget_line (indent, rfc934_nesting)
1462*0b459c2cSDavid du Colombier int indent;
1463*0b459c2cSDavid du Colombier int rfc934_nesting;
1464*0b459c2cSDavid du Colombier {
1465*0b459c2cSDavid du Colombier register FILE *fp = pfp;
1466*0b459c2cSDavid du Colombier register int c;
1467*0b459c2cSDavid du Colombier register int i = 0;
1468*0b459c2cSDavid du Colombier register char *b;
1469*0b459c2cSDavid du Colombier register size_t s;
1470*0b459c2cSDavid du Colombier
1471*0b459c2cSDavid du Colombier for (;;)
1472*0b459c2cSDavid du Colombier {
1473*0b459c2cSDavid du Colombier c = getc (fp);
1474*0b459c2cSDavid du Colombier if (c == EOF)
1475*0b459c2cSDavid du Colombier {
1476*0b459c2cSDavid du Colombier if (ferror (fp))
1477*0b459c2cSDavid du Colombier read_fatal ();
1478*0b459c2cSDavid du Colombier return 0;
1479*0b459c2cSDavid du Colombier }
1480*0b459c2cSDavid du Colombier if (indent <= i)
1481*0b459c2cSDavid du Colombier break;
1482*0b459c2cSDavid du Colombier if (c == ' ' || c == 'X')
1483*0b459c2cSDavid du Colombier i++;
1484*0b459c2cSDavid du Colombier else if (c == '\t')
1485*0b459c2cSDavid du Colombier i = (i + 8) & ~7;
1486*0b459c2cSDavid du Colombier else
1487*0b459c2cSDavid du Colombier break;
1488*0b459c2cSDavid du Colombier }
1489*0b459c2cSDavid du Colombier
1490*0b459c2cSDavid du Colombier i = 0;
1491*0b459c2cSDavid du Colombier b = buf;
1492*0b459c2cSDavid du Colombier
1493*0b459c2cSDavid du Colombier while (c == '-' && 0 <= --rfc934_nesting)
1494*0b459c2cSDavid du Colombier {
1495*0b459c2cSDavid du Colombier c = getc (fp);
1496*0b459c2cSDavid du Colombier if (c == EOF)
1497*0b459c2cSDavid du Colombier goto patch_ends_in_middle_of_line;
1498*0b459c2cSDavid du Colombier if (c != ' ')
1499*0b459c2cSDavid du Colombier {
1500*0b459c2cSDavid du Colombier i = 1;
1501*0b459c2cSDavid du Colombier b[0] = '-';
1502*0b459c2cSDavid du Colombier break;
1503*0b459c2cSDavid du Colombier }
1504*0b459c2cSDavid du Colombier c = getc (fp);
1505*0b459c2cSDavid du Colombier if (c == EOF)
1506*0b459c2cSDavid du Colombier goto patch_ends_in_middle_of_line;
1507*0b459c2cSDavid du Colombier }
1508*0b459c2cSDavid du Colombier
1509*0b459c2cSDavid du Colombier s = bufsize;
1510*0b459c2cSDavid du Colombier
1511*0b459c2cSDavid du Colombier for (;;)
1512*0b459c2cSDavid du Colombier {
1513*0b459c2cSDavid du Colombier if (i == s - 1)
1514*0b459c2cSDavid du Colombier {
1515*0b459c2cSDavid du Colombier s *= 2;
1516*0b459c2cSDavid du Colombier b = realloc (b, s);
1517*0b459c2cSDavid du Colombier if (!b)
1518*0b459c2cSDavid du Colombier {
1519*0b459c2cSDavid du Colombier if (!using_plan_a)
1520*0b459c2cSDavid du Colombier memory_fatal ();
1521*0b459c2cSDavid du Colombier return (size_t) -1;
1522*0b459c2cSDavid du Colombier }
1523*0b459c2cSDavid du Colombier buf = b;
1524*0b459c2cSDavid du Colombier bufsize = s;
1525*0b459c2cSDavid du Colombier }
1526*0b459c2cSDavid du Colombier b[i++] = c;
1527*0b459c2cSDavid du Colombier if (c == '\n')
1528*0b459c2cSDavid du Colombier break;
1529*0b459c2cSDavid du Colombier c = getc (fp);
1530*0b459c2cSDavid du Colombier if (c == EOF)
1531*0b459c2cSDavid du Colombier goto patch_ends_in_middle_of_line;
1532*0b459c2cSDavid du Colombier }
1533*0b459c2cSDavid du Colombier
1534*0b459c2cSDavid du Colombier b[i] = '\0';
1535*0b459c2cSDavid du Colombier p_input_line++;
1536*0b459c2cSDavid du Colombier return i;
1537*0b459c2cSDavid du Colombier
1538*0b459c2cSDavid du Colombier patch_ends_in_middle_of_line:
1539*0b459c2cSDavid du Colombier if (ferror (fp))
1540*0b459c2cSDavid du Colombier read_fatal ();
1541*0b459c2cSDavid du Colombier say ("patch unexpectedly ends in middle of line\n");
1542*0b459c2cSDavid du Colombier return 0;
1543*0b459c2cSDavid du Colombier }
1544*0b459c2cSDavid du Colombier
1545*0b459c2cSDavid du Colombier static bool
incomplete_line()1546*0b459c2cSDavid du Colombier incomplete_line ()
1547*0b459c2cSDavid du Colombier {
1548*0b459c2cSDavid du Colombier register FILE *fp = pfp;
1549*0b459c2cSDavid du Colombier register int c;
1550*0b459c2cSDavid du Colombier register file_offset line_beginning = file_tell (fp);
1551*0b459c2cSDavid du Colombier
1552*0b459c2cSDavid du Colombier if (getc (fp) == '\\')
1553*0b459c2cSDavid du Colombier {
1554*0b459c2cSDavid du Colombier while ((c = getc (fp)) != '\n' && c != EOF)
1555*0b459c2cSDavid du Colombier continue;
1556*0b459c2cSDavid du Colombier return TRUE;
1557*0b459c2cSDavid du Colombier }
1558*0b459c2cSDavid du Colombier else
1559*0b459c2cSDavid du Colombier {
1560*0b459c2cSDavid du Colombier /* We don't trust ungetc. */
1561*0b459c2cSDavid du Colombier Fseek (pfp, line_beginning, SEEK_SET);
1562*0b459c2cSDavid du Colombier return FALSE;
1563*0b459c2cSDavid du Colombier }
1564*0b459c2cSDavid du Colombier }
1565*0b459c2cSDavid du Colombier
1566*0b459c2cSDavid du Colombier /* Reverse the old and new portions of the current hunk. */
1567*0b459c2cSDavid du Colombier
1568*0b459c2cSDavid du Colombier bool
pch_swap()1569*0b459c2cSDavid du Colombier pch_swap()
1570*0b459c2cSDavid du Colombier {
1571*0b459c2cSDavid du Colombier char **tp_line; /* the text of the hunk */
1572*0b459c2cSDavid du Colombier size_t *tp_len; /* length of each line */
1573*0b459c2cSDavid du Colombier char *tp_char; /* +, -, and ! */
1574*0b459c2cSDavid du Colombier register LINENUM i;
1575*0b459c2cSDavid du Colombier register LINENUM n;
1576*0b459c2cSDavid du Colombier bool blankline = FALSE;
1577*0b459c2cSDavid du Colombier register char *s;
1578*0b459c2cSDavid du Colombier
1579*0b459c2cSDavid du Colombier i = p_first;
1580*0b459c2cSDavid du Colombier p_first = p_newfirst;
1581*0b459c2cSDavid du Colombier p_newfirst = i;
1582*0b459c2cSDavid du Colombier
1583*0b459c2cSDavid du Colombier /* make a scratch copy */
1584*0b459c2cSDavid du Colombier
1585*0b459c2cSDavid du Colombier tp_line = p_line;
1586*0b459c2cSDavid du Colombier tp_len = p_len;
1587*0b459c2cSDavid du Colombier tp_char = p_Char;
1588*0b459c2cSDavid du Colombier p_line = 0; /* force set_hunkmax to allocate again */
1589*0b459c2cSDavid du Colombier p_len = 0;
1590*0b459c2cSDavid du Colombier p_Char = 0;
1591*0b459c2cSDavid du Colombier set_hunkmax();
1592*0b459c2cSDavid du Colombier if (!p_line || !p_len || !p_Char) {
1593*0b459c2cSDavid du Colombier if (p_line)
1594*0b459c2cSDavid du Colombier free (p_line);
1595*0b459c2cSDavid du Colombier p_line = tp_line;
1596*0b459c2cSDavid du Colombier if (p_len)
1597*0b459c2cSDavid du Colombier free (p_len);
1598*0b459c2cSDavid du Colombier p_len = tp_len;
1599*0b459c2cSDavid du Colombier if (p_Char)
1600*0b459c2cSDavid du Colombier free (p_Char);
1601*0b459c2cSDavid du Colombier p_Char = tp_char;
1602*0b459c2cSDavid du Colombier return FALSE; /* not enough memory to swap hunk! */
1603*0b459c2cSDavid du Colombier }
1604*0b459c2cSDavid du Colombier
1605*0b459c2cSDavid du Colombier /* now turn the new into the old */
1606*0b459c2cSDavid du Colombier
1607*0b459c2cSDavid du Colombier i = p_ptrn_lines + 1;
1608*0b459c2cSDavid du Colombier if (tp_char[i] == '\n') { /* account for possible blank line */
1609*0b459c2cSDavid du Colombier blankline = TRUE;
1610*0b459c2cSDavid du Colombier i++;
1611*0b459c2cSDavid du Colombier }
1612*0b459c2cSDavid du Colombier if (p_efake >= 0) { /* fix non-freeable ptr range */
1613*0b459c2cSDavid du Colombier if (p_efake <= i)
1614*0b459c2cSDavid du Colombier n = p_end - i + 1;
1615*0b459c2cSDavid du Colombier else
1616*0b459c2cSDavid du Colombier n = -i;
1617*0b459c2cSDavid du Colombier p_efake += n;
1618*0b459c2cSDavid du Colombier p_bfake += n;
1619*0b459c2cSDavid du Colombier }
1620*0b459c2cSDavid du Colombier for (n=0; i <= p_end; i++,n++) {
1621*0b459c2cSDavid du Colombier p_line[n] = tp_line[i];
1622*0b459c2cSDavid du Colombier p_Char[n] = tp_char[i];
1623*0b459c2cSDavid du Colombier if (p_Char[n] == '+')
1624*0b459c2cSDavid du Colombier p_Char[n] = '-';
1625*0b459c2cSDavid du Colombier p_len[n] = tp_len[i];
1626*0b459c2cSDavid du Colombier }
1627*0b459c2cSDavid du Colombier if (blankline) {
1628*0b459c2cSDavid du Colombier i = p_ptrn_lines + 1;
1629*0b459c2cSDavid du Colombier p_line[n] = tp_line[i];
1630*0b459c2cSDavid du Colombier p_Char[n] = tp_char[i];
1631*0b459c2cSDavid du Colombier p_len[n] = tp_len[i];
1632*0b459c2cSDavid du Colombier n++;
1633*0b459c2cSDavid du Colombier }
1634*0b459c2cSDavid du Colombier assert(p_Char[0] == '=');
1635*0b459c2cSDavid du Colombier p_Char[0] = '*';
1636*0b459c2cSDavid du Colombier for (s=p_line[0]; *s; s++)
1637*0b459c2cSDavid du Colombier if (*s == '-')
1638*0b459c2cSDavid du Colombier *s = '*';
1639*0b459c2cSDavid du Colombier
1640*0b459c2cSDavid du Colombier /* now turn the old into the new */
1641*0b459c2cSDavid du Colombier
1642*0b459c2cSDavid du Colombier assert(tp_char[0] == '*');
1643*0b459c2cSDavid du Colombier tp_char[0] = '=';
1644*0b459c2cSDavid du Colombier for (s=tp_line[0]; *s; s++)
1645*0b459c2cSDavid du Colombier if (*s == '*')
1646*0b459c2cSDavid du Colombier *s = '-';
1647*0b459c2cSDavid du Colombier for (i=0; n <= p_end; i++,n++) {
1648*0b459c2cSDavid du Colombier p_line[n] = tp_line[i];
1649*0b459c2cSDavid du Colombier p_Char[n] = tp_char[i];
1650*0b459c2cSDavid du Colombier if (p_Char[n] == '-')
1651*0b459c2cSDavid du Colombier p_Char[n] = '+';
1652*0b459c2cSDavid du Colombier p_len[n] = tp_len[i];
1653*0b459c2cSDavid du Colombier }
1654*0b459c2cSDavid du Colombier assert(i == p_ptrn_lines + 1);
1655*0b459c2cSDavid du Colombier i = p_ptrn_lines;
1656*0b459c2cSDavid du Colombier p_ptrn_lines = p_repl_lines;
1657*0b459c2cSDavid du Colombier p_repl_lines = i;
1658*0b459c2cSDavid du Colombier if (tp_line)
1659*0b459c2cSDavid du Colombier free (tp_line);
1660*0b459c2cSDavid du Colombier if (tp_len)
1661*0b459c2cSDavid du Colombier free (tp_len);
1662*0b459c2cSDavid du Colombier if (tp_char)
1663*0b459c2cSDavid du Colombier free (tp_char);
1664*0b459c2cSDavid du Colombier return TRUE;
1665*0b459c2cSDavid du Colombier }
1666*0b459c2cSDavid du Colombier
1667*0b459c2cSDavid du Colombier /* Return whether file WHICH (0 = old, 1 = new) appears to nonexistent.
1668*0b459c2cSDavid du Colombier Return 1 for empty, 2 for nonexistent. */
1669*0b459c2cSDavid du Colombier
1670*0b459c2cSDavid du Colombier bool
pch_says_nonexistent(which)1671*0b459c2cSDavid du Colombier pch_says_nonexistent (which)
1672*0b459c2cSDavid du Colombier int which;
1673*0b459c2cSDavid du Colombier {
1674*0b459c2cSDavid du Colombier return p_says_nonexistent[which];
1675*0b459c2cSDavid du Colombier }
1676*0b459c2cSDavid du Colombier
1677*0b459c2cSDavid du Colombier /* Return timestamp of patch header for file WHICH (0 = old, 1 = new),
1678*0b459c2cSDavid du Colombier or -1 if there was no timestamp or an error in the timestamp. */
1679*0b459c2cSDavid du Colombier
1680*0b459c2cSDavid du Colombier time_t
pch_timestamp(which)1681*0b459c2cSDavid du Colombier pch_timestamp (which)
1682*0b459c2cSDavid du Colombier int which;
1683*0b459c2cSDavid du Colombier {
1684*0b459c2cSDavid du Colombier return p_timestamp[which];
1685*0b459c2cSDavid du Colombier }
1686*0b459c2cSDavid du Colombier
1687*0b459c2cSDavid du Colombier /* Return the specified line position in the old file of the old context. */
1688*0b459c2cSDavid du Colombier
1689*0b459c2cSDavid du Colombier LINENUM
pch_first()1690*0b459c2cSDavid du Colombier pch_first()
1691*0b459c2cSDavid du Colombier {
1692*0b459c2cSDavid du Colombier return p_first;
1693*0b459c2cSDavid du Colombier }
1694*0b459c2cSDavid du Colombier
1695*0b459c2cSDavid du Colombier /* Return the number of lines of old context. */
1696*0b459c2cSDavid du Colombier
1697*0b459c2cSDavid du Colombier LINENUM
pch_ptrn_lines()1698*0b459c2cSDavid du Colombier pch_ptrn_lines()
1699*0b459c2cSDavid du Colombier {
1700*0b459c2cSDavid du Colombier return p_ptrn_lines;
1701*0b459c2cSDavid du Colombier }
1702*0b459c2cSDavid du Colombier
1703*0b459c2cSDavid du Colombier /* Return the probable line position in the new file of the first line. */
1704*0b459c2cSDavid du Colombier
1705*0b459c2cSDavid du Colombier LINENUM
pch_newfirst()1706*0b459c2cSDavid du Colombier pch_newfirst()
1707*0b459c2cSDavid du Colombier {
1708*0b459c2cSDavid du Colombier return p_newfirst;
1709*0b459c2cSDavid du Colombier }
1710*0b459c2cSDavid du Colombier
1711*0b459c2cSDavid du Colombier /* Return the number of lines in the replacement text including context. */
1712*0b459c2cSDavid du Colombier
1713*0b459c2cSDavid du Colombier LINENUM
pch_repl_lines()1714*0b459c2cSDavid du Colombier pch_repl_lines()
1715*0b459c2cSDavid du Colombier {
1716*0b459c2cSDavid du Colombier return p_repl_lines;
1717*0b459c2cSDavid du Colombier }
1718*0b459c2cSDavid du Colombier
1719*0b459c2cSDavid du Colombier /* Return the number of lines in the whole hunk. */
1720*0b459c2cSDavid du Colombier
1721*0b459c2cSDavid du Colombier LINENUM
pch_end()1722*0b459c2cSDavid du Colombier pch_end()
1723*0b459c2cSDavid du Colombier {
1724*0b459c2cSDavid du Colombier return p_end;
1725*0b459c2cSDavid du Colombier }
1726*0b459c2cSDavid du Colombier
1727*0b459c2cSDavid du Colombier /* Return the number of context lines before the first changed line. */
1728*0b459c2cSDavid du Colombier
1729*0b459c2cSDavid du Colombier LINENUM
pch_prefix_context()1730*0b459c2cSDavid du Colombier pch_prefix_context ()
1731*0b459c2cSDavid du Colombier {
1732*0b459c2cSDavid du Colombier return p_prefix_context;
1733*0b459c2cSDavid du Colombier }
1734*0b459c2cSDavid du Colombier
1735*0b459c2cSDavid du Colombier /* Return the number of context lines after the last changed line. */
1736*0b459c2cSDavid du Colombier
1737*0b459c2cSDavid du Colombier LINENUM
pch_suffix_context()1738*0b459c2cSDavid du Colombier pch_suffix_context ()
1739*0b459c2cSDavid du Colombier {
1740*0b459c2cSDavid du Colombier return p_suffix_context;
1741*0b459c2cSDavid du Colombier }
1742*0b459c2cSDavid du Colombier
1743*0b459c2cSDavid du Colombier /* Return the length of a particular patch line. */
1744*0b459c2cSDavid du Colombier
1745*0b459c2cSDavid du Colombier size_t
pch_line_len(line)1746*0b459c2cSDavid du Colombier pch_line_len(line)
1747*0b459c2cSDavid du Colombier LINENUM line;
1748*0b459c2cSDavid du Colombier {
1749*0b459c2cSDavid du Colombier return p_len[line];
1750*0b459c2cSDavid du Colombier }
1751*0b459c2cSDavid du Colombier
1752*0b459c2cSDavid du Colombier /* Return the control character (+, -, *, !, etc) for a patch line. */
1753*0b459c2cSDavid du Colombier
1754*0b459c2cSDavid du Colombier char
pch_char(line)1755*0b459c2cSDavid du Colombier pch_char(line)
1756*0b459c2cSDavid du Colombier LINENUM line;
1757*0b459c2cSDavid du Colombier {
1758*0b459c2cSDavid du Colombier return p_Char[line];
1759*0b459c2cSDavid du Colombier }
1760*0b459c2cSDavid du Colombier
1761*0b459c2cSDavid du Colombier /* Return a pointer to a particular patch line. */
1762*0b459c2cSDavid du Colombier
1763*0b459c2cSDavid du Colombier char *
pfetch(line)1764*0b459c2cSDavid du Colombier pfetch(line)
1765*0b459c2cSDavid du Colombier LINENUM line;
1766*0b459c2cSDavid du Colombier {
1767*0b459c2cSDavid du Colombier return p_line[line];
1768*0b459c2cSDavid du Colombier }
1769*0b459c2cSDavid du Colombier
1770*0b459c2cSDavid du Colombier /* Output a patch line. */
1771*0b459c2cSDavid du Colombier
1772*0b459c2cSDavid du Colombier bool
pch_write_line(line,file)1773*0b459c2cSDavid du Colombier pch_write_line (line, file)
1774*0b459c2cSDavid du Colombier LINENUM line;
1775*0b459c2cSDavid du Colombier FILE *file;
1776*0b459c2cSDavid du Colombier {
1777*0b459c2cSDavid du Colombier bool after_newline = p_line[line][p_len[line] - 1] == '\n';
1778*0b459c2cSDavid du Colombier if (! fwrite (p_line[line], sizeof (*p_line[line]), p_len[line], file))
1779*0b459c2cSDavid du Colombier write_fatal ();
1780*0b459c2cSDavid du Colombier return after_newline;
1781*0b459c2cSDavid du Colombier }
1782*0b459c2cSDavid du Colombier
1783*0b459c2cSDavid du Colombier /* Return where in the patch file this hunk began, for error messages. */
1784*0b459c2cSDavid du Colombier
1785*0b459c2cSDavid du Colombier LINENUM
pch_hunk_beg()1786*0b459c2cSDavid du Colombier pch_hunk_beg()
1787*0b459c2cSDavid du Colombier {
1788*0b459c2cSDavid du Colombier return p_hunk_beg;
1789*0b459c2cSDavid du Colombier }
1790*0b459c2cSDavid du Colombier
1791*0b459c2cSDavid du Colombier /* Apply an ed script by feeding ed itself. */
1792*0b459c2cSDavid du Colombier
1793*0b459c2cSDavid du Colombier void
do_ed_script(ofp)1794*0b459c2cSDavid du Colombier do_ed_script (ofp)
1795*0b459c2cSDavid du Colombier FILE *ofp;
1796*0b459c2cSDavid du Colombier {
1797*0b459c2cSDavid du Colombier static char const ed_program[] = ed_PROGRAM;
1798*0b459c2cSDavid du Colombier
1799*0b459c2cSDavid du Colombier register char *t;
1800*0b459c2cSDavid du Colombier register file_offset beginning_of_this_line;
1801*0b459c2cSDavid du Colombier register bool this_line_is_command = FALSE;
1802*0b459c2cSDavid du Colombier register FILE *pipefp = 0;
1803*0b459c2cSDavid du Colombier register size_t chars_read;
1804*0b459c2cSDavid du Colombier
1805*0b459c2cSDavid du Colombier if (!skip_rest_of_patch) {
1806*0b459c2cSDavid du Colombier assert (! inerrno);
1807*0b459c2cSDavid du Colombier copy_file (inname, TMPOUTNAME, instat.st_mode);
1808*0b459c2cSDavid du Colombier sprintf (buf, "%s %s%s", ed_program, verbosity == VERBOSE ? "" : "- ",
1809*0b459c2cSDavid du Colombier TMPOUTNAME);
1810*0b459c2cSDavid du Colombier fflush (stdout);
1811*0b459c2cSDavid du Colombier pipefp = popen(buf, binary_transput ? "wb" : "w");
1812*0b459c2cSDavid du Colombier if (!pipefp)
1813*0b459c2cSDavid du Colombier pfatal ("can't open pipe to `%s'", buf);
1814*0b459c2cSDavid du Colombier }
1815*0b459c2cSDavid du Colombier for (;;) {
1816*0b459c2cSDavid du Colombier beginning_of_this_line = file_tell (pfp);
1817*0b459c2cSDavid du Colombier chars_read = get_line ();
1818*0b459c2cSDavid du Colombier if (! chars_read) {
1819*0b459c2cSDavid du Colombier next_intuit_at(beginning_of_this_line,p_input_line);
1820*0b459c2cSDavid du Colombier break;
1821*0b459c2cSDavid du Colombier }
1822*0b459c2cSDavid du Colombier for (t = buf; ISDIGIT (*t) || *t == ','; t++)
1823*0b459c2cSDavid du Colombier continue;
1824*0b459c2cSDavid du Colombier this_line_is_command = (ISDIGIT (*buf) &&
1825*0b459c2cSDavid du Colombier (*t == 'd' || *t == 'c' || *t == 'a' || *t == 'i' || *t == 's') );
1826*0b459c2cSDavid du Colombier if (this_line_is_command) {
1827*0b459c2cSDavid du Colombier if (pipefp)
1828*0b459c2cSDavid du Colombier if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
1829*0b459c2cSDavid du Colombier write_fatal ();
1830*0b459c2cSDavid du Colombier if (*t != 'd' && *t != 's') {
1831*0b459c2cSDavid du Colombier while ((chars_read = get_line ()) != 0) {
1832*0b459c2cSDavid du Colombier if (pipefp)
1833*0b459c2cSDavid du Colombier if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
1834*0b459c2cSDavid du Colombier write_fatal ();
1835*0b459c2cSDavid du Colombier if (chars_read == 2 && strEQ (buf, ".\n"))
1836*0b459c2cSDavid du Colombier break;
1837*0b459c2cSDavid du Colombier }
1838*0b459c2cSDavid du Colombier }
1839*0b459c2cSDavid du Colombier }
1840*0b459c2cSDavid du Colombier else {
1841*0b459c2cSDavid du Colombier next_intuit_at(beginning_of_this_line,p_input_line);
1842*0b459c2cSDavid du Colombier break;
1843*0b459c2cSDavid du Colombier }
1844*0b459c2cSDavid du Colombier }
1845*0b459c2cSDavid du Colombier if (!pipefp)
1846*0b459c2cSDavid du Colombier return;
1847*0b459c2cSDavid du Colombier if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0
1848*0b459c2cSDavid du Colombier || fflush (pipefp) != 0)
1849*0b459c2cSDavid du Colombier write_fatal ();
1850*0b459c2cSDavid du Colombier if (pclose (pipefp) != 0)
1851*0b459c2cSDavid du Colombier fatal ("%s FAILED", ed_program);
1852*0b459c2cSDavid du Colombier
1853*0b459c2cSDavid du Colombier if (ofp)
1854*0b459c2cSDavid du Colombier {
1855*0b459c2cSDavid du Colombier FILE *ifp = fopen (TMPOUTNAME, binary_transput ? "rb" : "r");
1856*0b459c2cSDavid du Colombier int c;
1857*0b459c2cSDavid du Colombier if (!ifp)
1858*0b459c2cSDavid du Colombier pfatal ("can't open `%s'", TMPOUTNAME);
1859*0b459c2cSDavid du Colombier while ((c = getc (ifp)) != EOF)
1860*0b459c2cSDavid du Colombier if (putc (c, ofp) == EOF)
1861*0b459c2cSDavid du Colombier write_fatal ();
1862*0b459c2cSDavid du Colombier if (ferror (ifp) || fclose (ifp) != 0)
1863*0b459c2cSDavid du Colombier read_fatal ();
1864*0b459c2cSDavid du Colombier }
1865*0b459c2cSDavid du Colombier }
1866