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