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