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