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