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