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