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