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