1e56ef7d3SXin LI 22dd076b8SGabor Kovesdan /*- 32dd076b8SGabor Kovesdan * Copyright 1986, Larry Wall 42dd076b8SGabor Kovesdan * 52dd076b8SGabor Kovesdan * Redistribution and use in source and binary forms, with or without 62dd076b8SGabor Kovesdan * modification, are permitted provided that the following condition is met: 72dd076b8SGabor Kovesdan * 1. Redistributions of source code must retain the above copyright notice, 82dd076b8SGabor Kovesdan * this condition and the following disclaimer. 92dd076b8SGabor Kovesdan * 102dd076b8SGabor Kovesdan * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY 112dd076b8SGabor Kovesdan * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 122dd076b8SGabor Kovesdan * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 132dd076b8SGabor Kovesdan * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR 142dd076b8SGabor Kovesdan * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 152dd076b8SGabor Kovesdan * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 162dd076b8SGabor Kovesdan * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 172dd076b8SGabor Kovesdan * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 182dd076b8SGabor Kovesdan * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 192dd076b8SGabor Kovesdan * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 202dd076b8SGabor Kovesdan * SUCH DAMAGE. 212dd076b8SGabor Kovesdan * 222dd076b8SGabor Kovesdan * patch - a program to apply diffs to original files 232dd076b8SGabor Kovesdan * 242dd076b8SGabor Kovesdan * -C option added in 1998, original code by Marc Espie, based on FreeBSD 252dd076b8SGabor Kovesdan * behaviour 262dd076b8SGabor Kovesdan * 272b468ebaSPedro F. Giffuni * $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $ 28e56ef7d3SXin LI * $FreeBSD$ 292dd076b8SGabor Kovesdan */ 302dd076b8SGabor Kovesdan 312dd076b8SGabor Kovesdan #include <sys/types.h> 322dd076b8SGabor Kovesdan #include <sys/stat.h> 332dd076b8SGabor Kovesdan 342dd076b8SGabor Kovesdan #include <ctype.h> 352dd076b8SGabor Kovesdan #include <libgen.h> 362dd076b8SGabor Kovesdan #include <limits.h> 372dd076b8SGabor Kovesdan #include <stdio.h> 382dd076b8SGabor Kovesdan #include <stdlib.h> 392dd076b8SGabor Kovesdan #include <string.h> 402dd076b8SGabor Kovesdan #include <unistd.h> 412dd076b8SGabor Kovesdan 422dd076b8SGabor Kovesdan #include "common.h" 432dd076b8SGabor Kovesdan #include "util.h" 442dd076b8SGabor Kovesdan #include "pch.h" 452dd076b8SGabor Kovesdan #include "pathnames.h" 462dd076b8SGabor Kovesdan 472dd076b8SGabor Kovesdan /* Patch (diff listing) abstract type. */ 482dd076b8SGabor Kovesdan 49e91a64deSPedro F. Giffuni static off_t p_filesize; /* size of the patch file */ 502dd076b8SGabor Kovesdan static LINENUM p_first; /* 1st line number */ 512dd076b8SGabor Kovesdan static LINENUM p_newfirst; /* 1st line number of replacement */ 522dd076b8SGabor Kovesdan static LINENUM p_ptrn_lines; /* # lines in pattern */ 532dd076b8SGabor Kovesdan static LINENUM p_repl_lines; /* # lines in replacement text */ 542dd076b8SGabor Kovesdan static LINENUM p_end = -1; /* last line in hunk */ 552dd076b8SGabor Kovesdan static LINENUM p_max; /* max allowed value of p_end */ 562dd076b8SGabor Kovesdan static LINENUM p_context = 3; /* # of context lines */ 572dd076b8SGabor Kovesdan static LINENUM p_input_line = 0; /* current line # from patch file */ 582dd076b8SGabor Kovesdan static char **p_line = NULL;/* the text of the hunk */ 59c1a08643SPedro F. Giffuni static unsigned short *p_len = NULL; /* length of each line */ 602dd076b8SGabor Kovesdan static char *p_char = NULL; /* +, -, and ! */ 612dd076b8SGabor Kovesdan static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */ 622dd076b8SGabor Kovesdan static int p_indent; /* indent to patch */ 63e91a64deSPedro F. Giffuni static off_t p_base; /* where to intuit this time */ 642dd076b8SGabor Kovesdan static LINENUM p_bline; /* line # of p_base */ 65e91a64deSPedro F. Giffuni static off_t p_start; /* where intuit found a patch */ 662dd076b8SGabor Kovesdan static LINENUM p_sline; /* and the line number for it */ 672dd076b8SGabor Kovesdan static LINENUM p_hunk_beg; /* line number of current hunk */ 682dd076b8SGabor Kovesdan static LINENUM p_efake = -1; /* end of faked up lines--don't free */ 692dd076b8SGabor Kovesdan static LINENUM p_bfake = -1; /* beg of faked up lines */ 702dd076b8SGabor Kovesdan static FILE *pfp = NULL; /* patch file pointer */ 712dd076b8SGabor Kovesdan static char *bestguess = NULL; /* guess at correct filename */ 722dd076b8SGabor Kovesdan 732dd076b8SGabor Kovesdan static void grow_hunkmax(void); 742dd076b8SGabor Kovesdan static int intuit_diff_type(void); 75e91a64deSPedro F. Giffuni static void next_intuit_at(off_t, LINENUM); 76e91a64deSPedro F. Giffuni static void skip_to(off_t, LINENUM); 772dd076b8SGabor Kovesdan static size_t pgets(bool _do_indent); 782dd076b8SGabor Kovesdan static char *best_name(const struct file_name *, bool); 792dd076b8SGabor Kovesdan static char *posix_name(const struct file_name *, bool); 802dd076b8SGabor Kovesdan static size_t num_components(const char *); 81d3fc0cb8SPedro F. Giffuni static LINENUM strtolinenum(char *, char **); 822dd076b8SGabor Kovesdan 832dd076b8SGabor Kovesdan /* 842dd076b8SGabor Kovesdan * Prepare to look for the next patch in the patch file. 852dd076b8SGabor Kovesdan */ 862dd076b8SGabor Kovesdan void 872dd076b8SGabor Kovesdan re_patch(void) 882dd076b8SGabor Kovesdan { 892dd076b8SGabor Kovesdan p_first = 0; 902dd076b8SGabor Kovesdan p_newfirst = 0; 912dd076b8SGabor Kovesdan p_ptrn_lines = 0; 922dd076b8SGabor Kovesdan p_repl_lines = 0; 932dd076b8SGabor Kovesdan p_end = (LINENUM) - 1; 942dd076b8SGabor Kovesdan p_max = 0; 952dd076b8SGabor Kovesdan p_indent = 0; 962dd076b8SGabor Kovesdan } 972dd076b8SGabor Kovesdan 982dd076b8SGabor Kovesdan /* 992dd076b8SGabor Kovesdan * Open the patch file at the beginning of time. 1002dd076b8SGabor Kovesdan */ 1012dd076b8SGabor Kovesdan void 1022dd076b8SGabor Kovesdan open_patch_file(const char *filename) 1032dd076b8SGabor Kovesdan { 1042dd076b8SGabor Kovesdan struct stat filestat; 1050571fd57SDavid E. O'Brien int nr, nw; 1062dd076b8SGabor Kovesdan 1072dd076b8SGabor Kovesdan if (filename == NULL || *filename == '\0' || strEQ(filename, "-")) { 1082dd076b8SGabor Kovesdan pfp = fopen(TMPPATNAME, "w"); 1092dd076b8SGabor Kovesdan if (pfp == NULL) 1102dd076b8SGabor Kovesdan pfatal("can't create %s", TMPPATNAME); 1110571fd57SDavid E. O'Brien while ((nr = fread(buf, 1, buf_size, stdin)) > 0) { 1120571fd57SDavid E. O'Brien nw = fwrite(buf, 1, nr, pfp); 1130571fd57SDavid E. O'Brien if (nr != nw) 1140571fd57SDavid E. O'Brien pfatal("write error to %s", TMPPATNAME); 1150571fd57SDavid E. O'Brien } 1162dd076b8SGabor Kovesdan if (ferror(pfp) || fclose(pfp)) 1172dd076b8SGabor Kovesdan pfatal("can't write %s", TMPPATNAME); 1182dd076b8SGabor Kovesdan filename = TMPPATNAME; 1192dd076b8SGabor Kovesdan } 1202dd076b8SGabor Kovesdan pfp = fopen(filename, "r"); 1212dd076b8SGabor Kovesdan if (pfp == NULL) 1222dd076b8SGabor Kovesdan pfatal("patch file %s not found", filename); 123e91a64deSPedro F. Giffuni if (fstat(fileno(pfp), &filestat)) 124e91a64deSPedro F. Giffuni pfatal("can't stat %s", filename); 1252dd076b8SGabor Kovesdan p_filesize = filestat.st_size; 126e91a64deSPedro F. Giffuni next_intuit_at(0, 1L); /* start at the beginning */ 1272dd076b8SGabor Kovesdan set_hunkmax(); 1282dd076b8SGabor Kovesdan } 1292dd076b8SGabor Kovesdan 1302dd076b8SGabor Kovesdan /* 1312dd076b8SGabor Kovesdan * Make sure our dynamically realloced tables are malloced to begin with. 1322dd076b8SGabor Kovesdan */ 1332dd076b8SGabor Kovesdan void 1342dd076b8SGabor Kovesdan set_hunkmax(void) 1352dd076b8SGabor Kovesdan { 1362dd076b8SGabor Kovesdan if (p_line == NULL) 137c44f94d0SPedro F. Giffuni p_line = malloc(hunkmax * sizeof(char *)); 1382dd076b8SGabor Kovesdan if (p_len == NULL) 139c1a08643SPedro F. Giffuni p_len = malloc(hunkmax * sizeof(unsigned short)); 1402dd076b8SGabor Kovesdan if (p_char == NULL) 141c44f94d0SPedro F. Giffuni p_char = malloc(hunkmax * sizeof(char)); 1422dd076b8SGabor Kovesdan } 1432dd076b8SGabor Kovesdan 1442dd076b8SGabor Kovesdan /* 1452dd076b8SGabor Kovesdan * Enlarge the arrays containing the current hunk of patch. 1462dd076b8SGabor Kovesdan */ 1472dd076b8SGabor Kovesdan static void 1482dd076b8SGabor Kovesdan grow_hunkmax(void) 1492dd076b8SGabor Kovesdan { 150c44f94d0SPedro F. Giffuni int new_hunkmax = hunkmax * 2; 1512dd076b8SGabor Kovesdan 1522dd076b8SGabor Kovesdan if (p_line == NULL || p_len == NULL || p_char == NULL) 1532dd076b8SGabor Kovesdan fatal("Internal memory allocation error\n"); 1542dd076b8SGabor Kovesdan 155c44f94d0SPedro F. Giffuni p_line = reallocf(p_line, new_hunkmax * sizeof(char *)); 156c1a08643SPedro F. Giffuni p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short)); 157c44f94d0SPedro F. Giffuni p_char = reallocf(p_char, new_hunkmax * sizeof(char)); 1582dd076b8SGabor Kovesdan 1592dd076b8SGabor Kovesdan if (p_line != NULL && p_len != NULL && p_char != NULL) { 1602dd076b8SGabor Kovesdan hunkmax = new_hunkmax; 1612dd076b8SGabor Kovesdan return; 1622dd076b8SGabor Kovesdan } 1632dd076b8SGabor Kovesdan 1642dd076b8SGabor Kovesdan if (!using_plan_a) 1652dd076b8SGabor Kovesdan fatal("out of memory\n"); 1662dd076b8SGabor Kovesdan out_of_mem = true; /* whatever is null will be allocated again */ 1672dd076b8SGabor Kovesdan /* from within plan_a(), of all places */ 1682dd076b8SGabor Kovesdan } 1692dd076b8SGabor Kovesdan 1702dd076b8SGabor Kovesdan /* True if the remainder of the patch file contains a diff of some sort. */ 1712dd076b8SGabor Kovesdan 1722dd076b8SGabor Kovesdan bool 1732dd076b8SGabor Kovesdan there_is_another_patch(void) 1742dd076b8SGabor Kovesdan { 1752dd076b8SGabor Kovesdan bool exists = false; 1762dd076b8SGabor Kovesdan 177e91a64deSPedro F. Giffuni if (p_base != 0 && p_base >= p_filesize) { 1782dd076b8SGabor Kovesdan if (verbose) 1792dd076b8SGabor Kovesdan say("done\n"); 1802dd076b8SGabor Kovesdan return false; 1812dd076b8SGabor Kovesdan } 1822dd076b8SGabor Kovesdan if (verbose) 1832dd076b8SGabor Kovesdan say("Hmm..."); 1842dd076b8SGabor Kovesdan diff_type = intuit_diff_type(); 1852dd076b8SGabor Kovesdan if (!diff_type) { 186e91a64deSPedro F. Giffuni if (p_base != 0) { 1872dd076b8SGabor Kovesdan if (verbose) 1882dd076b8SGabor Kovesdan say(" Ignoring the trailing garbage.\ndone\n"); 1892dd076b8SGabor Kovesdan } else 1902dd076b8SGabor Kovesdan say(" I can't seem to find a patch in there anywhere.\n"); 1912dd076b8SGabor Kovesdan return false; 1922dd076b8SGabor Kovesdan } 1932dd076b8SGabor Kovesdan if (verbose) 1942dd076b8SGabor Kovesdan say(" %sooks like %s to me...\n", 195e91a64deSPedro F. Giffuni (p_base == 0 ? "L" : "The next patch l"), 1962dd076b8SGabor Kovesdan diff_type == UNI_DIFF ? "a unified diff" : 1972dd076b8SGabor Kovesdan diff_type == CONTEXT_DIFF ? "a context diff" : 1982dd076b8SGabor Kovesdan diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" : 1992dd076b8SGabor Kovesdan diff_type == NORMAL_DIFF ? "a normal diff" : 2002dd076b8SGabor Kovesdan "an ed script"); 2012dd076b8SGabor Kovesdan if (p_indent && verbose) 2022dd076b8SGabor Kovesdan say("(Patch is indented %d space%s.)\n", p_indent, 2032dd076b8SGabor Kovesdan p_indent == 1 ? "" : "s"); 2042dd076b8SGabor Kovesdan skip_to(p_start, p_sline); 2052dd076b8SGabor Kovesdan while (filearg[0] == NULL) { 2062dd076b8SGabor Kovesdan if (force || batch) { 2072dd076b8SGabor Kovesdan say("No file to patch. Skipping...\n"); 208*547e0acbSPedro F. Giffuni filearg[0] = xstrdup(bestguess); 2092dd076b8SGabor Kovesdan skip_rest_of_patch = true; 2102dd076b8SGabor Kovesdan return true; 2112dd076b8SGabor Kovesdan } 2122dd076b8SGabor Kovesdan ask("File to patch: "); 2132dd076b8SGabor Kovesdan if (*buf != '\n') { 2142dd076b8SGabor Kovesdan free(bestguess); 215*547e0acbSPedro F. Giffuni bestguess = xstrdup(buf); 2162dd076b8SGabor Kovesdan filearg[0] = fetchname(buf, &exists, 0); 2172dd076b8SGabor Kovesdan } 2182dd076b8SGabor Kovesdan if (!exists) { 2192dd076b8SGabor Kovesdan ask("No file found--skip this patch? [n] "); 2202dd076b8SGabor Kovesdan if (*buf != 'y') 2212dd076b8SGabor Kovesdan continue; 2222dd076b8SGabor Kovesdan if (verbose) 2232dd076b8SGabor Kovesdan say("Skipping patch...\n"); 2242dd076b8SGabor Kovesdan free(filearg[0]); 2252dd076b8SGabor Kovesdan filearg[0] = fetchname(bestguess, &exists, 0); 2262dd076b8SGabor Kovesdan skip_rest_of_patch = true; 2272dd076b8SGabor Kovesdan return true; 2282dd076b8SGabor Kovesdan } 2292dd076b8SGabor Kovesdan } 2302dd076b8SGabor Kovesdan return true; 2312dd076b8SGabor Kovesdan } 2322dd076b8SGabor Kovesdan 2332dd076b8SGabor Kovesdan static void 2342dd076b8SGabor Kovesdan p4_fetchname(struct file_name *name, char *str) 2352dd076b8SGabor Kovesdan { 2362dd076b8SGabor Kovesdan char *t, *h; 2372dd076b8SGabor Kovesdan 2382dd076b8SGabor Kovesdan /* Skip leading whitespace. */ 2392dd076b8SGabor Kovesdan while (isspace((unsigned char)*str)) 2402dd076b8SGabor Kovesdan str++; 2412dd076b8SGabor Kovesdan 2422dd076b8SGabor Kovesdan /* Remove the file revision number. */ 2432dd076b8SGabor Kovesdan for (t = str, h = NULL; *t != '\0' && !isspace((unsigned char)*t); t++) 2442dd076b8SGabor Kovesdan if (*t == '#') 2452dd076b8SGabor Kovesdan h = t; 2462dd076b8SGabor Kovesdan if (h != NULL) 2472dd076b8SGabor Kovesdan *h = '\0'; 2482dd076b8SGabor Kovesdan 2492dd076b8SGabor Kovesdan name->path = fetchname(str, &name->exists, strippath); 2502dd076b8SGabor Kovesdan } 2512dd076b8SGabor Kovesdan 2522dd076b8SGabor Kovesdan /* Determine what kind of diff is in the remaining part of the patch file. */ 2532dd076b8SGabor Kovesdan 2542dd076b8SGabor Kovesdan static int 2552dd076b8SGabor Kovesdan intuit_diff_type(void) 2562dd076b8SGabor Kovesdan { 257e91a64deSPedro F. Giffuni off_t this_line = 0, previous_line; 258e91a64deSPedro F. Giffuni off_t first_command_line = -1; 2592dd076b8SGabor Kovesdan LINENUM fcl_line = -1; 2602dd076b8SGabor Kovesdan bool last_line_was_command = false, this_is_a_command = false; 2612dd076b8SGabor Kovesdan bool stars_last_line = false, stars_this_line = false; 2622dd076b8SGabor Kovesdan char *s, *t; 2632dd076b8SGabor Kovesdan int indent, retval; 2642dd076b8SGabor Kovesdan struct file_name names[MAX_FILE]; 2652dd076b8SGabor Kovesdan 2662dd076b8SGabor Kovesdan memset(names, 0, sizeof(names)); 2672dd076b8SGabor Kovesdan ok_to_create_file = false; 268e91a64deSPedro F. Giffuni fseeko(pfp, p_base, SEEK_SET); 2692dd076b8SGabor Kovesdan p_input_line = p_bline - 1; 2702dd076b8SGabor Kovesdan for (;;) { 2712dd076b8SGabor Kovesdan previous_line = this_line; 2722dd076b8SGabor Kovesdan last_line_was_command = this_is_a_command; 2732dd076b8SGabor Kovesdan stars_last_line = stars_this_line; 274e91a64deSPedro F. Giffuni this_line = ftello(pfp); 2752dd076b8SGabor Kovesdan indent = 0; 2762dd076b8SGabor Kovesdan p_input_line++; 2772dd076b8SGabor Kovesdan if (pgets(false) == 0) { 278e91a64deSPedro F. Giffuni if (first_command_line >= 0) { 2792dd076b8SGabor Kovesdan /* nothing but deletes!? */ 2802dd076b8SGabor Kovesdan p_start = first_command_line; 2812dd076b8SGabor Kovesdan p_sline = fcl_line; 2822dd076b8SGabor Kovesdan retval = ED_DIFF; 2832dd076b8SGabor Kovesdan goto scan_exit; 2842dd076b8SGabor Kovesdan } else { 2852dd076b8SGabor Kovesdan p_start = this_line; 2862dd076b8SGabor Kovesdan p_sline = p_input_line; 2872dd076b8SGabor Kovesdan retval = 0; 2882dd076b8SGabor Kovesdan goto scan_exit; 2892dd076b8SGabor Kovesdan } 2902dd076b8SGabor Kovesdan } 2912dd076b8SGabor Kovesdan for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) { 2922dd076b8SGabor Kovesdan if (*s == '\t') 2932dd076b8SGabor Kovesdan indent += 8 - (indent % 8); 2942dd076b8SGabor Kovesdan else 2952dd076b8SGabor Kovesdan indent++; 2962dd076b8SGabor Kovesdan } 2972dd076b8SGabor Kovesdan for (t = s; isdigit((unsigned char)*t) || *t == ','; t++) 2982dd076b8SGabor Kovesdan ; 2992dd076b8SGabor Kovesdan this_is_a_command = (isdigit((unsigned char)*s) && 3002dd076b8SGabor Kovesdan (*t == 'd' || *t == 'c' || *t == 'a')); 301e91a64deSPedro F. Giffuni if (first_command_line < 0 && this_is_a_command) { 3022dd076b8SGabor Kovesdan first_command_line = this_line; 3032dd076b8SGabor Kovesdan fcl_line = p_input_line; 3042dd076b8SGabor Kovesdan p_indent = indent; /* assume this for now */ 3052dd076b8SGabor Kovesdan } 3062dd076b8SGabor Kovesdan if (!stars_last_line && strnEQ(s, "*** ", 4)) 3072dd076b8SGabor Kovesdan names[OLD_FILE].path = fetchname(s + 4, 3082dd076b8SGabor Kovesdan &names[OLD_FILE].exists, strippath); 3092dd076b8SGabor Kovesdan else if (strnEQ(s, "--- ", 4)) 3102dd076b8SGabor Kovesdan names[NEW_FILE].path = fetchname(s + 4, 3112dd076b8SGabor Kovesdan &names[NEW_FILE].exists, strippath); 3122dd076b8SGabor Kovesdan else if (strnEQ(s, "+++ ", 4)) 3132dd076b8SGabor Kovesdan /* pretend it is the old name */ 3142dd076b8SGabor Kovesdan names[OLD_FILE].path = fetchname(s + 4, 3152dd076b8SGabor Kovesdan &names[OLD_FILE].exists, strippath); 3162dd076b8SGabor Kovesdan else if (strnEQ(s, "Index:", 6)) 3172dd076b8SGabor Kovesdan names[INDEX_FILE].path = fetchname(s + 6, 3182dd076b8SGabor Kovesdan &names[INDEX_FILE].exists, strippath); 3192dd076b8SGabor Kovesdan else if (strnEQ(s, "Prereq:", 7)) { 3202dd076b8SGabor Kovesdan for (t = s + 7; isspace((unsigned char)*t); t++) 3212dd076b8SGabor Kovesdan ; 322*547e0acbSPedro F. Giffuni revision = xstrdup(t); 3232b468ebaSPedro F. Giffuni for (t = revision; 3242b468ebaSPedro F. Giffuni *t && !isspace((unsigned char)*t); t++) 3252dd076b8SGabor Kovesdan ; 3262dd076b8SGabor Kovesdan *t = '\0'; 3272dd076b8SGabor Kovesdan if (*revision == '\0') { 3282dd076b8SGabor Kovesdan free(revision); 3292dd076b8SGabor Kovesdan revision = NULL; 3302dd076b8SGabor Kovesdan } 3312dd076b8SGabor Kovesdan } else if (strnEQ(s, "==== ", 5)) { 3322dd076b8SGabor Kovesdan /* Perforce-style diffs. */ 3332dd076b8SGabor Kovesdan if ((t = strstr(s + 5, " - ")) != NULL) 3342dd076b8SGabor Kovesdan p4_fetchname(&names[NEW_FILE], t + 3); 3352dd076b8SGabor Kovesdan p4_fetchname(&names[OLD_FILE], s + 5); 3362dd076b8SGabor Kovesdan } 3372dd076b8SGabor Kovesdan if ((!diff_type || diff_type == ED_DIFF) && 338e91a64deSPedro F. Giffuni first_command_line >= 0 && 3392dd076b8SGabor Kovesdan strEQ(s, ".\n")) { 3402dd076b8SGabor Kovesdan p_indent = indent; 3412dd076b8SGabor Kovesdan p_start = first_command_line; 3422dd076b8SGabor Kovesdan p_sline = fcl_line; 3432dd076b8SGabor Kovesdan retval = ED_DIFF; 3442dd076b8SGabor Kovesdan goto scan_exit; 3452dd076b8SGabor Kovesdan } 3462dd076b8SGabor Kovesdan if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) { 3472dd076b8SGabor Kovesdan if (strnEQ(s + 4, "0,0", 3)) 3482dd076b8SGabor Kovesdan ok_to_create_file = true; 3492dd076b8SGabor Kovesdan p_indent = indent; 3502dd076b8SGabor Kovesdan p_start = this_line; 3512dd076b8SGabor Kovesdan p_sline = p_input_line; 3522dd076b8SGabor Kovesdan retval = UNI_DIFF; 3532dd076b8SGabor Kovesdan goto scan_exit; 3542dd076b8SGabor Kovesdan } 3552dd076b8SGabor Kovesdan stars_this_line = strnEQ(s, "********", 8); 3562dd076b8SGabor Kovesdan if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line && 3572dd076b8SGabor Kovesdan strnEQ(s, "*** ", 4)) { 358d3fc0cb8SPedro F. Giffuni if (strtolinenum(s + 4, &s) == 0) 3592dd076b8SGabor Kovesdan ok_to_create_file = true; 3602dd076b8SGabor Kovesdan /* 3612dd076b8SGabor Kovesdan * If this is a new context diff the character just 362e91a64deSPedro F. Giffuni * at the end of the line is a '*'. 3632dd076b8SGabor Kovesdan */ 364e91a64deSPedro F. Giffuni while (*s && *s != '\n') 3652dd076b8SGabor Kovesdan s++; 3662dd076b8SGabor Kovesdan p_indent = indent; 3672dd076b8SGabor Kovesdan p_start = previous_line; 3682dd076b8SGabor Kovesdan p_sline = p_input_line - 1; 3692dd076b8SGabor Kovesdan retval = (*(s - 1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF); 3702dd076b8SGabor Kovesdan goto scan_exit; 3712dd076b8SGabor Kovesdan } 3722dd076b8SGabor Kovesdan if ((!diff_type || diff_type == NORMAL_DIFF) && 3732dd076b8SGabor Kovesdan last_line_was_command && 3742dd076b8SGabor Kovesdan (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2))) { 3752dd076b8SGabor Kovesdan p_start = previous_line; 3762dd076b8SGabor Kovesdan p_sline = p_input_line - 1; 3772dd076b8SGabor Kovesdan p_indent = indent; 3782dd076b8SGabor Kovesdan retval = NORMAL_DIFF; 3792dd076b8SGabor Kovesdan goto scan_exit; 3802dd076b8SGabor Kovesdan } 3812dd076b8SGabor Kovesdan } 3822dd076b8SGabor Kovesdan scan_exit: 3832dd076b8SGabor Kovesdan if (retval == UNI_DIFF) { 3842dd076b8SGabor Kovesdan /* unswap old and new */ 3852dd076b8SGabor Kovesdan struct file_name tmp = names[OLD_FILE]; 3862dd076b8SGabor Kovesdan names[OLD_FILE] = names[NEW_FILE]; 3872dd076b8SGabor Kovesdan names[NEW_FILE] = tmp; 3882dd076b8SGabor Kovesdan } 3892dd076b8SGabor Kovesdan if (filearg[0] == NULL) { 3902dd076b8SGabor Kovesdan if (posix) 3912dd076b8SGabor Kovesdan filearg[0] = posix_name(names, ok_to_create_file); 3922dd076b8SGabor Kovesdan else { 3932dd076b8SGabor Kovesdan /* Ignore the Index: name for context diffs, like GNU */ 3942dd076b8SGabor Kovesdan if (names[OLD_FILE].path != NULL || 3952dd076b8SGabor Kovesdan names[NEW_FILE].path != NULL) { 3962dd076b8SGabor Kovesdan free(names[INDEX_FILE].path); 3972dd076b8SGabor Kovesdan names[INDEX_FILE].path = NULL; 3982dd076b8SGabor Kovesdan } 3992dd076b8SGabor Kovesdan filearg[0] = best_name(names, ok_to_create_file); 4002dd076b8SGabor Kovesdan } 4012dd076b8SGabor Kovesdan } 4022dd076b8SGabor Kovesdan 4032dd076b8SGabor Kovesdan free(bestguess); 4042dd076b8SGabor Kovesdan bestguess = NULL; 4052dd076b8SGabor Kovesdan if (filearg[0] != NULL) 406*547e0acbSPedro F. Giffuni bestguess = xstrdup(filearg[0]); 4072dd076b8SGabor Kovesdan else if (!ok_to_create_file) { 4082dd076b8SGabor Kovesdan /* 4092dd076b8SGabor Kovesdan * We don't want to create a new file but we need a 4102dd076b8SGabor Kovesdan * filename to set bestguess. Avoid setting filearg[0] 4112dd076b8SGabor Kovesdan * so the file is not created automatically. 4122dd076b8SGabor Kovesdan */ 4132dd076b8SGabor Kovesdan if (posix) 4142dd076b8SGabor Kovesdan bestguess = posix_name(names, true); 4152dd076b8SGabor Kovesdan else 4162dd076b8SGabor Kovesdan bestguess = best_name(names, true); 4172dd076b8SGabor Kovesdan } 4182dd076b8SGabor Kovesdan free(names[OLD_FILE].path); 4192dd076b8SGabor Kovesdan free(names[NEW_FILE].path); 4202dd076b8SGabor Kovesdan free(names[INDEX_FILE].path); 4212dd076b8SGabor Kovesdan return retval; 4222dd076b8SGabor Kovesdan } 4232dd076b8SGabor Kovesdan 4242dd076b8SGabor Kovesdan /* 4252dd076b8SGabor Kovesdan * Remember where this patch ends so we know where to start up again. 4262dd076b8SGabor Kovesdan */ 4272dd076b8SGabor Kovesdan static void 428e91a64deSPedro F. Giffuni next_intuit_at(off_t file_pos, LINENUM file_line) 4292dd076b8SGabor Kovesdan { 4302dd076b8SGabor Kovesdan p_base = file_pos; 4312dd076b8SGabor Kovesdan p_bline = file_line; 4322dd076b8SGabor Kovesdan } 4332dd076b8SGabor Kovesdan 4342dd076b8SGabor Kovesdan /* 435e91a64deSPedro F. Giffuni * Basically a verbose fseeko() to the actual diff listing. 4362dd076b8SGabor Kovesdan */ 4372dd076b8SGabor Kovesdan static void 438e91a64deSPedro F. Giffuni skip_to(off_t file_pos, LINENUM file_line) 4392dd076b8SGabor Kovesdan { 4402dd076b8SGabor Kovesdan size_t len; 4412dd076b8SGabor Kovesdan 4422dd076b8SGabor Kovesdan if (p_base > file_pos) 443e91a64deSPedro F. Giffuni fatal("Internal error: seek %lld>%lld\n", 444e91a64deSPedro F. Giffuni (long long)p_base, (long long)file_pos); 4452dd076b8SGabor Kovesdan if (verbose && p_base < file_pos) { 446e91a64deSPedro F. Giffuni fseeko(pfp, p_base, SEEK_SET); 4472dd076b8SGabor Kovesdan say("The text leading up to this was:\n--------------------------\n"); 448e91a64deSPedro F. Giffuni while (ftello(pfp) < file_pos) { 4492dd076b8SGabor Kovesdan len = pgets(false); 4502dd076b8SGabor Kovesdan if (len == 0) 4512dd076b8SGabor Kovesdan fatal("Unexpected end of file\n"); 4522dd076b8SGabor Kovesdan say("|%s", buf); 4532dd076b8SGabor Kovesdan } 4542dd076b8SGabor Kovesdan say("--------------------------\n"); 4552dd076b8SGabor Kovesdan } else 456e91a64deSPedro F. Giffuni fseeko(pfp, file_pos, SEEK_SET); 4572dd076b8SGabor Kovesdan p_input_line = file_line - 1; 4582dd076b8SGabor Kovesdan } 4592dd076b8SGabor Kovesdan 4602dd076b8SGabor Kovesdan /* Make this a function for better debugging. */ 4612dd076b8SGabor Kovesdan static void 4622dd076b8SGabor Kovesdan malformed(void) 4632dd076b8SGabor Kovesdan { 4642dd076b8SGabor Kovesdan fatal("malformed patch at line %ld: %s", p_input_line, buf); 4652dd076b8SGabor Kovesdan /* about as informative as "Syntax error" in C */ 4662dd076b8SGabor Kovesdan } 4672dd076b8SGabor Kovesdan 4682dd076b8SGabor Kovesdan /* 4692dd076b8SGabor Kovesdan * True if the line has been discarded (i.e. it is a line saying 4702dd076b8SGabor Kovesdan * "\ No newline at end of file".) 4712dd076b8SGabor Kovesdan */ 4722dd076b8SGabor Kovesdan static bool 4732dd076b8SGabor Kovesdan remove_special_line(void) 4742dd076b8SGabor Kovesdan { 4752dd076b8SGabor Kovesdan int c; 4762dd076b8SGabor Kovesdan 4772dd076b8SGabor Kovesdan c = fgetc(pfp); 4782dd076b8SGabor Kovesdan if (c == '\\') { 4792dd076b8SGabor Kovesdan do { 4802dd076b8SGabor Kovesdan c = fgetc(pfp); 4812dd076b8SGabor Kovesdan } while (c != EOF && c != '\n'); 4822dd076b8SGabor Kovesdan 4832dd076b8SGabor Kovesdan return true; 4842dd076b8SGabor Kovesdan } 4852dd076b8SGabor Kovesdan if (c != EOF) 486e91a64deSPedro F. Giffuni fseeko(pfp, -1, SEEK_CUR); 4872dd076b8SGabor Kovesdan 4882dd076b8SGabor Kovesdan return false; 4892dd076b8SGabor Kovesdan } 4902dd076b8SGabor Kovesdan 4912dd076b8SGabor Kovesdan /* 4922dd076b8SGabor Kovesdan * True if there is more of the current diff listing to process. 4932dd076b8SGabor Kovesdan */ 4942dd076b8SGabor Kovesdan bool 4952dd076b8SGabor Kovesdan another_hunk(void) 4962dd076b8SGabor Kovesdan { 497e91a64deSPedro F. Giffuni off_t line_beginning; /* file pos of the current line */ 4982dd076b8SGabor Kovesdan LINENUM repl_beginning; /* index of --- line */ 4992dd076b8SGabor Kovesdan LINENUM fillcnt; /* #lines of missing ptrn or repl */ 5002dd076b8SGabor Kovesdan LINENUM fillsrc; /* index of first line to copy */ 5012dd076b8SGabor Kovesdan LINENUM filldst; /* index of first missing line */ 5022dd076b8SGabor Kovesdan bool ptrn_spaces_eaten; /* ptrn was slightly misformed */ 5032dd076b8SGabor Kovesdan bool repl_could_be_missing; /* no + or ! lines in this hunk */ 5042dd076b8SGabor Kovesdan bool repl_missing; /* we are now backtracking */ 505e91a64deSPedro F. Giffuni off_t repl_backtrack_position; /* file pos of first repl line */ 5062dd076b8SGabor Kovesdan LINENUM repl_patch_line; /* input line number for same */ 5072dd076b8SGabor Kovesdan LINENUM ptrn_copiable; /* # of copiable lines in ptrn */ 5082dd076b8SGabor Kovesdan char *s; 5092dd076b8SGabor Kovesdan size_t len; 5102dd076b8SGabor Kovesdan int context = 0; 5112dd076b8SGabor Kovesdan 5122dd076b8SGabor Kovesdan while (p_end >= 0) { 5132dd076b8SGabor Kovesdan if (p_end == p_efake) 5142dd076b8SGabor Kovesdan p_end = p_bfake; /* don't free twice */ 5152dd076b8SGabor Kovesdan else 5162dd076b8SGabor Kovesdan free(p_line[p_end]); 5172dd076b8SGabor Kovesdan p_end--; 5182dd076b8SGabor Kovesdan } 5192dd076b8SGabor Kovesdan p_efake = -1; 5202dd076b8SGabor Kovesdan 5212dd076b8SGabor Kovesdan p_max = hunkmax; /* gets reduced when --- found */ 5222dd076b8SGabor Kovesdan if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) { 523e91a64deSPedro F. Giffuni line_beginning = ftello(pfp); 5242dd076b8SGabor Kovesdan repl_beginning = 0; 5252dd076b8SGabor Kovesdan fillcnt = 0; 5262dd076b8SGabor Kovesdan fillsrc = 0; 5272dd076b8SGabor Kovesdan filldst = 0; 5282dd076b8SGabor Kovesdan ptrn_spaces_eaten = false; 5292dd076b8SGabor Kovesdan repl_could_be_missing = true; 5302dd076b8SGabor Kovesdan repl_missing = false; 5312dd076b8SGabor Kovesdan repl_backtrack_position = 0; 5322dd076b8SGabor Kovesdan repl_patch_line = 0; 5332dd076b8SGabor Kovesdan ptrn_copiable = 0; 5342dd076b8SGabor Kovesdan 5352dd076b8SGabor Kovesdan len = pgets(true); 5362dd076b8SGabor Kovesdan p_input_line++; 5372dd076b8SGabor Kovesdan if (len == 0 || strnNE(buf, "********", 8)) { 5382dd076b8SGabor Kovesdan next_intuit_at(line_beginning, p_input_line); 5392dd076b8SGabor Kovesdan return false; 5402dd076b8SGabor Kovesdan } 5412dd076b8SGabor Kovesdan p_context = 100; 5422dd076b8SGabor Kovesdan p_hunk_beg = p_input_line + 1; 5432dd076b8SGabor Kovesdan while (p_end < p_max) { 544e91a64deSPedro F. Giffuni line_beginning = ftello(pfp); 5452dd076b8SGabor Kovesdan len = pgets(true); 5462dd076b8SGabor Kovesdan p_input_line++; 5472dd076b8SGabor Kovesdan if (len == 0) { 5482dd076b8SGabor Kovesdan if (p_max - p_end < 4) { 5492dd076b8SGabor Kovesdan /* assume blank lines got chopped */ 5502dd076b8SGabor Kovesdan strlcpy(buf, " \n", buf_size); 5512dd076b8SGabor Kovesdan } else { 5522dd076b8SGabor Kovesdan if (repl_beginning && repl_could_be_missing) { 5532dd076b8SGabor Kovesdan repl_missing = true; 5542dd076b8SGabor Kovesdan goto hunk_done; 5552dd076b8SGabor Kovesdan } 5562dd076b8SGabor Kovesdan fatal("unexpected end of file in patch\n"); 5572dd076b8SGabor Kovesdan } 5582dd076b8SGabor Kovesdan } 5592dd076b8SGabor Kovesdan p_end++; 5602dd076b8SGabor Kovesdan if (p_end >= hunkmax) 5612dd076b8SGabor Kovesdan fatal("Internal error: hunk larger than hunk " 5622dd076b8SGabor Kovesdan "buffer size"); 5632dd076b8SGabor Kovesdan p_char[p_end] = *buf; 5642dd076b8SGabor Kovesdan p_line[p_end] = NULL; 5652dd076b8SGabor Kovesdan switch (*buf) { 5662dd076b8SGabor Kovesdan case '*': 5672dd076b8SGabor Kovesdan if (strnEQ(buf, "********", 8)) { 5682dd076b8SGabor Kovesdan if (repl_beginning && repl_could_be_missing) { 5692dd076b8SGabor Kovesdan repl_missing = true; 5702dd076b8SGabor Kovesdan goto hunk_done; 5712dd076b8SGabor Kovesdan } else 5722dd076b8SGabor Kovesdan fatal("unexpected end of hunk " 5732dd076b8SGabor Kovesdan "at line %ld\n", 5742dd076b8SGabor Kovesdan p_input_line); 5752dd076b8SGabor Kovesdan } 5762dd076b8SGabor Kovesdan if (p_end != 0) { 5772dd076b8SGabor Kovesdan if (repl_beginning && repl_could_be_missing) { 5782dd076b8SGabor Kovesdan repl_missing = true; 5792dd076b8SGabor Kovesdan goto hunk_done; 5802dd076b8SGabor Kovesdan } 5812dd076b8SGabor Kovesdan fatal("unexpected *** at line %ld: %s", 5822dd076b8SGabor Kovesdan p_input_line, buf); 5832dd076b8SGabor Kovesdan } 5842dd076b8SGabor Kovesdan context = 0; 5852dd076b8SGabor Kovesdan p_line[p_end] = savestr(buf); 5862dd076b8SGabor Kovesdan if (out_of_mem) { 5872dd076b8SGabor Kovesdan p_end--; 5882dd076b8SGabor Kovesdan return false; 5892dd076b8SGabor Kovesdan } 5902b468ebaSPedro F. Giffuni for (s = buf; 5912b468ebaSPedro F. Giffuni *s && !isdigit((unsigned char)*s); s++) 5922dd076b8SGabor Kovesdan ; 5932dd076b8SGabor Kovesdan if (!*s) 5942dd076b8SGabor Kovesdan malformed(); 5952dd076b8SGabor Kovesdan if (strnEQ(s, "0,0", 3)) 5962dd076b8SGabor Kovesdan memmove(s, s + 2, strlen(s + 2) + 1); 597d3fc0cb8SPedro F. Giffuni p_first = strtolinenum(s, &s); 5982dd076b8SGabor Kovesdan if (*s == ',') { 5992b468ebaSPedro F. Giffuni for (; 6002b468ebaSPedro F. Giffuni *s && !isdigit((unsigned char)*s); s++) 6012dd076b8SGabor Kovesdan ; 6022dd076b8SGabor Kovesdan if (!*s) 6032dd076b8SGabor Kovesdan malformed(); 604d3fc0cb8SPedro F. Giffuni p_ptrn_lines = strtolinenum(s, &s) - p_first + 1; 605d3fc0cb8SPedro F. Giffuni if (p_ptrn_lines < 0) 606d3fc0cb8SPedro F. Giffuni malformed(); 6072dd076b8SGabor Kovesdan } else if (p_first) 6082dd076b8SGabor Kovesdan p_ptrn_lines = 1; 6092dd076b8SGabor Kovesdan else { 6102dd076b8SGabor Kovesdan p_ptrn_lines = 0; 6112dd076b8SGabor Kovesdan p_first = 1; 6122dd076b8SGabor Kovesdan } 613d3fc0cb8SPedro F. Giffuni if (p_first >= LINENUM_MAX - p_ptrn_lines || 614d3fc0cb8SPedro F. Giffuni p_ptrn_lines >= LINENUM_MAX - 6) 615d3fc0cb8SPedro F. Giffuni malformed(); 6162dd076b8SGabor Kovesdan 6172dd076b8SGabor Kovesdan /* we need this much at least */ 6182dd076b8SGabor Kovesdan p_max = p_ptrn_lines + 6; 6192dd076b8SGabor Kovesdan while (p_max >= hunkmax) 6202dd076b8SGabor Kovesdan grow_hunkmax(); 6212dd076b8SGabor Kovesdan p_max = hunkmax; 6222dd076b8SGabor Kovesdan break; 6232dd076b8SGabor Kovesdan case '-': 6242dd076b8SGabor Kovesdan if (buf[1] == '-') { 6252dd076b8SGabor Kovesdan if (repl_beginning || 6262dd076b8SGabor Kovesdan (p_end != p_ptrn_lines + 1 + 6272dd076b8SGabor Kovesdan (p_char[p_end - 1] == '\n'))) { 6282dd076b8SGabor Kovesdan if (p_end == 1) { 6292dd076b8SGabor Kovesdan /* 6302dd076b8SGabor Kovesdan * `old' lines were omitted; 6312dd076b8SGabor Kovesdan * set up to fill them in 6322dd076b8SGabor Kovesdan * from 'new' context lines. 6332dd076b8SGabor Kovesdan */ 6342dd076b8SGabor Kovesdan p_end = p_ptrn_lines + 1; 6352dd076b8SGabor Kovesdan fillsrc = p_end + 1; 6362dd076b8SGabor Kovesdan filldst = 1; 6372dd076b8SGabor Kovesdan fillcnt = p_ptrn_lines; 6382dd076b8SGabor Kovesdan } else { 6392dd076b8SGabor Kovesdan if (repl_beginning) { 6402dd076b8SGabor Kovesdan if (repl_could_be_missing) { 6412dd076b8SGabor Kovesdan repl_missing = true; 6422dd076b8SGabor Kovesdan goto hunk_done; 6432dd076b8SGabor Kovesdan } 6442dd076b8SGabor Kovesdan fatal("duplicate \"---\" at line %ld--check line numbers at line %ld\n", 6452dd076b8SGabor Kovesdan p_input_line, p_hunk_beg + repl_beginning); 6462dd076b8SGabor Kovesdan } else { 6472dd076b8SGabor Kovesdan fatal("%s \"---\" at line %ld--check line numbers at line %ld\n", 6482dd076b8SGabor Kovesdan (p_end <= p_ptrn_lines 6492dd076b8SGabor Kovesdan ? "Premature" 6502dd076b8SGabor Kovesdan : "Overdue"), 6512dd076b8SGabor Kovesdan p_input_line, p_hunk_beg); 6522dd076b8SGabor Kovesdan } 6532dd076b8SGabor Kovesdan } 6542dd076b8SGabor Kovesdan } 6552dd076b8SGabor Kovesdan repl_beginning = p_end; 656e91a64deSPedro F. Giffuni repl_backtrack_position = ftello(pfp); 6572dd076b8SGabor Kovesdan repl_patch_line = p_input_line; 6582dd076b8SGabor Kovesdan p_line[p_end] = savestr(buf); 6592dd076b8SGabor Kovesdan if (out_of_mem) { 6602dd076b8SGabor Kovesdan p_end--; 6612dd076b8SGabor Kovesdan return false; 6622dd076b8SGabor Kovesdan } 6632dd076b8SGabor Kovesdan p_char[p_end] = '='; 6642dd076b8SGabor Kovesdan for (s = buf; *s && !isdigit((unsigned char)*s); s++) 6652dd076b8SGabor Kovesdan ; 6662dd076b8SGabor Kovesdan if (!*s) 6672dd076b8SGabor Kovesdan malformed(); 668d3fc0cb8SPedro F. Giffuni p_newfirst = strtolinenum(s, &s); 6692dd076b8SGabor Kovesdan if (*s == ',') { 6702dd076b8SGabor Kovesdan for (; *s && !isdigit((unsigned char)*s); s++) 6712dd076b8SGabor Kovesdan ; 6722dd076b8SGabor Kovesdan if (!*s) 6732dd076b8SGabor Kovesdan malformed(); 674d3fc0cb8SPedro F. Giffuni p_repl_lines = strtolinenum(s, &s) - 6752dd076b8SGabor Kovesdan p_newfirst + 1; 676d3fc0cb8SPedro F. Giffuni if (p_repl_lines < 0) 677d3fc0cb8SPedro F. Giffuni malformed(); 6782dd076b8SGabor Kovesdan } else if (p_newfirst) 6792dd076b8SGabor Kovesdan p_repl_lines = 1; 6802dd076b8SGabor Kovesdan else { 6812dd076b8SGabor Kovesdan p_repl_lines = 0; 6822dd076b8SGabor Kovesdan p_newfirst = 1; 6832dd076b8SGabor Kovesdan } 684d3fc0cb8SPedro F. Giffuni if (p_newfirst >= LINENUM_MAX - p_repl_lines || 685d3fc0cb8SPedro F. Giffuni p_repl_lines >= LINENUM_MAX - p_end) 686d3fc0cb8SPedro F. Giffuni malformed(); 6872dd076b8SGabor Kovesdan p_max = p_repl_lines + p_end; 6882dd076b8SGabor Kovesdan if (p_max > MAXHUNKSIZE) 6892dd076b8SGabor Kovesdan fatal("hunk too large (%ld lines) at line %ld: %s", 6902dd076b8SGabor Kovesdan p_max, p_input_line, buf); 6912dd076b8SGabor Kovesdan while (p_max >= hunkmax) 6922dd076b8SGabor Kovesdan grow_hunkmax(); 6932dd076b8SGabor Kovesdan if (p_repl_lines != ptrn_copiable && 6942dd076b8SGabor Kovesdan (p_context != 0 || p_repl_lines != 1)) 6952dd076b8SGabor Kovesdan repl_could_be_missing = false; 6962dd076b8SGabor Kovesdan break; 6972dd076b8SGabor Kovesdan } 6982dd076b8SGabor Kovesdan goto change_line; 6992dd076b8SGabor Kovesdan case '+': 7002dd076b8SGabor Kovesdan case '!': 7012dd076b8SGabor Kovesdan repl_could_be_missing = false; 7022dd076b8SGabor Kovesdan change_line: 7032dd076b8SGabor Kovesdan if (buf[1] == '\n' && canonicalize) 7042dd076b8SGabor Kovesdan strlcpy(buf + 1, " \n", buf_size - 1); 7052b468ebaSPedro F. Giffuni if (!isspace((unsigned char)buf[1]) && 7062b468ebaSPedro F. Giffuni buf[1] != '>' && buf[1] != '<' && 7072dd076b8SGabor Kovesdan repl_beginning && repl_could_be_missing) { 7082dd076b8SGabor Kovesdan repl_missing = true; 7092dd076b8SGabor Kovesdan goto hunk_done; 7102dd076b8SGabor Kovesdan } 7112dd076b8SGabor Kovesdan if (context >= 0) { 7122dd076b8SGabor Kovesdan if (context < p_context) 7132dd076b8SGabor Kovesdan p_context = context; 7142dd076b8SGabor Kovesdan context = -1000; 7152dd076b8SGabor Kovesdan } 7162dd076b8SGabor Kovesdan p_line[p_end] = savestr(buf + 2); 7172dd076b8SGabor Kovesdan if (out_of_mem) { 7182dd076b8SGabor Kovesdan p_end--; 7192dd076b8SGabor Kovesdan return false; 7202dd076b8SGabor Kovesdan } 7212dd076b8SGabor Kovesdan if (p_end == p_ptrn_lines) { 7222dd076b8SGabor Kovesdan if (remove_special_line()) { 7232dd076b8SGabor Kovesdan int l; 7242dd076b8SGabor Kovesdan 7252dd076b8SGabor Kovesdan l = strlen(p_line[p_end]) - 1; 7262dd076b8SGabor Kovesdan (p_line[p_end])[l] = 0; 7272dd076b8SGabor Kovesdan } 7282dd076b8SGabor Kovesdan } 7292dd076b8SGabor Kovesdan break; 7302dd076b8SGabor Kovesdan case '\t': 7312dd076b8SGabor Kovesdan case '\n': /* assume the 2 spaces got eaten */ 7322dd076b8SGabor Kovesdan if (repl_beginning && repl_could_be_missing && 7332dd076b8SGabor Kovesdan (!ptrn_spaces_eaten || 7342dd076b8SGabor Kovesdan diff_type == NEW_CONTEXT_DIFF)) { 7352dd076b8SGabor Kovesdan repl_missing = true; 7362dd076b8SGabor Kovesdan goto hunk_done; 7372dd076b8SGabor Kovesdan } 7382dd076b8SGabor Kovesdan p_line[p_end] = savestr(buf); 7392dd076b8SGabor Kovesdan if (out_of_mem) { 7402dd076b8SGabor Kovesdan p_end--; 7412dd076b8SGabor Kovesdan return false; 7422dd076b8SGabor Kovesdan } 7432dd076b8SGabor Kovesdan if (p_end != p_ptrn_lines + 1) { 7442dd076b8SGabor Kovesdan ptrn_spaces_eaten |= (repl_beginning != 0); 7452dd076b8SGabor Kovesdan context++; 7462dd076b8SGabor Kovesdan if (!repl_beginning) 7472dd076b8SGabor Kovesdan ptrn_copiable++; 7482dd076b8SGabor Kovesdan p_char[p_end] = ' '; 7492dd076b8SGabor Kovesdan } 7502dd076b8SGabor Kovesdan break; 7512dd076b8SGabor Kovesdan case ' ': 7522dd076b8SGabor Kovesdan if (!isspace((unsigned char)buf[1]) && 7532dd076b8SGabor Kovesdan repl_beginning && repl_could_be_missing) { 7542dd076b8SGabor Kovesdan repl_missing = true; 7552dd076b8SGabor Kovesdan goto hunk_done; 7562dd076b8SGabor Kovesdan } 7572dd076b8SGabor Kovesdan context++; 7582dd076b8SGabor Kovesdan if (!repl_beginning) 7592dd076b8SGabor Kovesdan ptrn_copiable++; 7602dd076b8SGabor Kovesdan p_line[p_end] = savestr(buf + 2); 7612dd076b8SGabor Kovesdan if (out_of_mem) { 7622dd076b8SGabor Kovesdan p_end--; 7632dd076b8SGabor Kovesdan return false; 7642dd076b8SGabor Kovesdan } 7652dd076b8SGabor Kovesdan break; 7662dd076b8SGabor Kovesdan default: 7672dd076b8SGabor Kovesdan if (repl_beginning && repl_could_be_missing) { 7682dd076b8SGabor Kovesdan repl_missing = true; 7692dd076b8SGabor Kovesdan goto hunk_done; 7702dd076b8SGabor Kovesdan } 7712dd076b8SGabor Kovesdan malformed(); 7722dd076b8SGabor Kovesdan } 7732dd076b8SGabor Kovesdan /* set up p_len for strncmp() so we don't have to */ 7742dd076b8SGabor Kovesdan /* assume null termination */ 7752dd076b8SGabor Kovesdan if (p_line[p_end]) 7762dd076b8SGabor Kovesdan p_len[p_end] = strlen(p_line[p_end]); 7772dd076b8SGabor Kovesdan else 7782dd076b8SGabor Kovesdan p_len[p_end] = 0; 7792dd076b8SGabor Kovesdan } 7802dd076b8SGabor Kovesdan 7812dd076b8SGabor Kovesdan hunk_done: 7822dd076b8SGabor Kovesdan if (p_end >= 0 && !repl_beginning) 7832dd076b8SGabor Kovesdan fatal("no --- found in patch at line %ld\n", pch_hunk_beg()); 7842dd076b8SGabor Kovesdan 7852dd076b8SGabor Kovesdan if (repl_missing) { 7862dd076b8SGabor Kovesdan 7872dd076b8SGabor Kovesdan /* reset state back to just after --- */ 7882dd076b8SGabor Kovesdan p_input_line = repl_patch_line; 7892dd076b8SGabor Kovesdan for (p_end--; p_end > repl_beginning; p_end--) 7902dd076b8SGabor Kovesdan free(p_line[p_end]); 791e91a64deSPedro F. Giffuni fseeko(pfp, repl_backtrack_position, SEEK_SET); 7922dd076b8SGabor Kovesdan 7932dd076b8SGabor Kovesdan /* redundant 'new' context lines were omitted - set */ 7942dd076b8SGabor Kovesdan /* up to fill them in from the old file context */ 7952dd076b8SGabor Kovesdan if (!p_context && p_repl_lines == 1) { 7962dd076b8SGabor Kovesdan p_repl_lines = 0; 7972dd076b8SGabor Kovesdan p_max--; 7982dd076b8SGabor Kovesdan } 7992dd076b8SGabor Kovesdan fillsrc = 1; 8002dd076b8SGabor Kovesdan filldst = repl_beginning + 1; 8012dd076b8SGabor Kovesdan fillcnt = p_repl_lines; 8022dd076b8SGabor Kovesdan p_end = p_max; 8032dd076b8SGabor Kovesdan } else if (!p_context && fillcnt == 1) { 8042dd076b8SGabor Kovesdan /* the first hunk was a null hunk with no context */ 8052dd076b8SGabor Kovesdan /* and we were expecting one line -- fix it up. */ 8062dd076b8SGabor Kovesdan while (filldst < p_end) { 8072dd076b8SGabor Kovesdan p_line[filldst] = p_line[filldst + 1]; 8082dd076b8SGabor Kovesdan p_char[filldst] = p_char[filldst + 1]; 8092dd076b8SGabor Kovesdan p_len[filldst] = p_len[filldst + 1]; 8102dd076b8SGabor Kovesdan filldst++; 8112dd076b8SGabor Kovesdan } 8122dd076b8SGabor Kovesdan #if 0 8132dd076b8SGabor Kovesdan repl_beginning--; /* this doesn't need to be fixed */ 8142dd076b8SGabor Kovesdan #endif 8152dd076b8SGabor Kovesdan p_end--; 8162dd076b8SGabor Kovesdan p_first++; /* do append rather than insert */ 8172dd076b8SGabor Kovesdan fillcnt = 0; 8182dd076b8SGabor Kovesdan p_ptrn_lines = 0; 8192dd076b8SGabor Kovesdan } 8202dd076b8SGabor Kovesdan if (diff_type == CONTEXT_DIFF && 8212dd076b8SGabor Kovesdan (fillcnt || (p_first > 1 && ptrn_copiable > 2 * p_context))) { 8222dd076b8SGabor Kovesdan if (verbose) 8232dd076b8SGabor Kovesdan say("%s\n%s\n%s\n", 8242dd076b8SGabor Kovesdan "(Fascinating--this is really a new-style context diff but without", 8252dd076b8SGabor Kovesdan "the telltale extra asterisks on the *** line that usually indicate", 8262dd076b8SGabor Kovesdan "the new style...)"); 8272dd076b8SGabor Kovesdan diff_type = NEW_CONTEXT_DIFF; 8282dd076b8SGabor Kovesdan } 8292dd076b8SGabor Kovesdan /* if there were omitted context lines, fill them in now */ 8302dd076b8SGabor Kovesdan if (fillcnt) { 8312dd076b8SGabor Kovesdan p_bfake = filldst; /* remember where not to free() */ 8322dd076b8SGabor Kovesdan p_efake = filldst + fillcnt - 1; 8332dd076b8SGabor Kovesdan while (fillcnt-- > 0) { 8342dd076b8SGabor Kovesdan while (fillsrc <= p_end && p_char[fillsrc] != ' ') 8352dd076b8SGabor Kovesdan fillsrc++; 8362dd076b8SGabor Kovesdan if (fillsrc > p_end) 8372dd076b8SGabor Kovesdan fatal("replacement text or line numbers mangled in hunk at line %ld\n", 8382dd076b8SGabor Kovesdan p_hunk_beg); 8392dd076b8SGabor Kovesdan p_line[filldst] = p_line[fillsrc]; 8402dd076b8SGabor Kovesdan p_char[filldst] = p_char[fillsrc]; 8412dd076b8SGabor Kovesdan p_len[filldst] = p_len[fillsrc]; 8422dd076b8SGabor Kovesdan fillsrc++; 8432dd076b8SGabor Kovesdan filldst++; 8442dd076b8SGabor Kovesdan } 8452dd076b8SGabor Kovesdan while (fillsrc <= p_end && fillsrc != repl_beginning && 8462dd076b8SGabor Kovesdan p_char[fillsrc] != ' ') 8472dd076b8SGabor Kovesdan fillsrc++; 8482dd076b8SGabor Kovesdan #ifdef DEBUGGING 8492dd076b8SGabor Kovesdan if (debug & 64) 8502dd076b8SGabor Kovesdan printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n", 8512dd076b8SGabor Kovesdan fillsrc, filldst, repl_beginning, p_end + 1); 8522dd076b8SGabor Kovesdan #endif 8532dd076b8SGabor Kovesdan if (fillsrc != p_end + 1 && fillsrc != repl_beginning) 8542dd076b8SGabor Kovesdan malformed(); 8552dd076b8SGabor Kovesdan if (filldst != p_end + 1 && filldst != repl_beginning) 8562dd076b8SGabor Kovesdan malformed(); 8572dd076b8SGabor Kovesdan } 8582dd076b8SGabor Kovesdan if (p_line[p_end] != NULL) { 8592dd076b8SGabor Kovesdan if (remove_special_line()) { 8602dd076b8SGabor Kovesdan p_len[p_end] -= 1; 8612dd076b8SGabor Kovesdan (p_line[p_end])[p_len[p_end]] = 0; 8622dd076b8SGabor Kovesdan } 8632dd076b8SGabor Kovesdan } 8642dd076b8SGabor Kovesdan } else if (diff_type == UNI_DIFF) { 8652dd076b8SGabor Kovesdan LINENUM fillold; /* index of old lines */ 8662dd076b8SGabor Kovesdan LINENUM fillnew; /* index of new lines */ 8672dd076b8SGabor Kovesdan char ch; 8682dd076b8SGabor Kovesdan 869e91a64deSPedro F. Giffuni line_beginning = ftello(pfp); /* file pos of the current line */ 8702dd076b8SGabor Kovesdan len = pgets(true); 8712dd076b8SGabor Kovesdan p_input_line++; 8722dd076b8SGabor Kovesdan if (len == 0 || strnNE(buf, "@@ -", 4)) { 8732dd076b8SGabor Kovesdan next_intuit_at(line_beginning, p_input_line); 8742dd076b8SGabor Kovesdan return false; 8752dd076b8SGabor Kovesdan } 8762dd076b8SGabor Kovesdan s = buf + 4; 8772dd076b8SGabor Kovesdan if (!*s) 8782dd076b8SGabor Kovesdan malformed(); 879d3fc0cb8SPedro F. Giffuni p_first = strtolinenum(s, &s); 8802dd076b8SGabor Kovesdan if (*s == ',') { 881d3fc0cb8SPedro F. Giffuni p_ptrn_lines = strtolinenum(s + 1, &s); 8822dd076b8SGabor Kovesdan } else 8832dd076b8SGabor Kovesdan p_ptrn_lines = 1; 8842dd076b8SGabor Kovesdan if (*s == ' ') 8852dd076b8SGabor Kovesdan s++; 8862dd076b8SGabor Kovesdan if (*s != '+' || !*++s) 8872dd076b8SGabor Kovesdan malformed(); 888d3fc0cb8SPedro F. Giffuni p_newfirst = strtolinenum(s, &s); 8892dd076b8SGabor Kovesdan if (*s == ',') { 890d3fc0cb8SPedro F. Giffuni p_repl_lines = strtolinenum(s + 1, &s); 8912dd076b8SGabor Kovesdan } else 8922dd076b8SGabor Kovesdan p_repl_lines = 1; 8932dd076b8SGabor Kovesdan if (*s == ' ') 8942dd076b8SGabor Kovesdan s++; 8952dd076b8SGabor Kovesdan if (*s != '@') 8962dd076b8SGabor Kovesdan malformed(); 897d3fc0cb8SPedro F. Giffuni if (p_first >= LINENUM_MAX - p_ptrn_lines || 898d3fc0cb8SPedro F. Giffuni p_newfirst > LINENUM_MAX - p_repl_lines || 899d3fc0cb8SPedro F. Giffuni p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1) 900d3fc0cb8SPedro F. Giffuni malformed(); 9012dd076b8SGabor Kovesdan if (!p_ptrn_lines) 9022dd076b8SGabor Kovesdan p_first++; /* do append rather than insert */ 9032dd076b8SGabor Kovesdan p_max = p_ptrn_lines + p_repl_lines + 1; 9042dd076b8SGabor Kovesdan while (p_max >= hunkmax) 9052dd076b8SGabor Kovesdan grow_hunkmax(); 9062dd076b8SGabor Kovesdan fillold = 1; 9072dd076b8SGabor Kovesdan fillnew = fillold + p_ptrn_lines; 9082dd076b8SGabor Kovesdan p_end = fillnew + p_repl_lines; 9092dd076b8SGabor Kovesdan snprintf(buf, buf_size, "*** %ld,%ld ****\n", p_first, 9102dd076b8SGabor Kovesdan p_first + p_ptrn_lines - 1); 9112dd076b8SGabor Kovesdan p_line[0] = savestr(buf); 9122dd076b8SGabor Kovesdan if (out_of_mem) { 9132dd076b8SGabor Kovesdan p_end = -1; 9142dd076b8SGabor Kovesdan return false; 9152dd076b8SGabor Kovesdan } 9162dd076b8SGabor Kovesdan p_char[0] = '*'; 9172dd076b8SGabor Kovesdan snprintf(buf, buf_size, "--- %ld,%ld ----\n", p_newfirst, 9182dd076b8SGabor Kovesdan p_newfirst + p_repl_lines - 1); 9192dd076b8SGabor Kovesdan p_line[fillnew] = savestr(buf); 9202dd076b8SGabor Kovesdan if (out_of_mem) { 9212dd076b8SGabor Kovesdan p_end = 0; 9222dd076b8SGabor Kovesdan return false; 9232dd076b8SGabor Kovesdan } 9242dd076b8SGabor Kovesdan p_char[fillnew++] = '='; 9252dd076b8SGabor Kovesdan p_context = 100; 9262dd076b8SGabor Kovesdan context = 0; 9272dd076b8SGabor Kovesdan p_hunk_beg = p_input_line + 1; 9282dd076b8SGabor Kovesdan while (fillold <= p_ptrn_lines || fillnew <= p_end) { 929e91a64deSPedro F. Giffuni line_beginning = ftello(pfp); 9302dd076b8SGabor Kovesdan len = pgets(true); 9312dd076b8SGabor Kovesdan p_input_line++; 9322dd076b8SGabor Kovesdan if (len == 0) { 9332dd076b8SGabor Kovesdan if (p_max - fillnew < 3) { 9342dd076b8SGabor Kovesdan /* assume blank lines got chopped */ 9352dd076b8SGabor Kovesdan strlcpy(buf, " \n", buf_size); 9362dd076b8SGabor Kovesdan } else { 9372dd076b8SGabor Kovesdan fatal("unexpected end of file in patch\n"); 9382dd076b8SGabor Kovesdan } 9392dd076b8SGabor Kovesdan } 9402dd076b8SGabor Kovesdan if (*buf == '\t' || *buf == '\n') { 9412dd076b8SGabor Kovesdan ch = ' '; /* assume the space got eaten */ 9422dd076b8SGabor Kovesdan s = savestr(buf); 9432dd076b8SGabor Kovesdan } else { 9442dd076b8SGabor Kovesdan ch = *buf; 9452dd076b8SGabor Kovesdan s = savestr(buf + 1); 9462dd076b8SGabor Kovesdan } 9472dd076b8SGabor Kovesdan if (out_of_mem) { 9482dd076b8SGabor Kovesdan while (--fillnew > p_ptrn_lines) 9492dd076b8SGabor Kovesdan free(p_line[fillnew]); 9502dd076b8SGabor Kovesdan p_end = fillold - 1; 9512dd076b8SGabor Kovesdan return false; 9522dd076b8SGabor Kovesdan } 9532dd076b8SGabor Kovesdan switch (ch) { 9542dd076b8SGabor Kovesdan case '-': 9552dd076b8SGabor Kovesdan if (fillold > p_ptrn_lines) { 9562dd076b8SGabor Kovesdan free(s); 9572dd076b8SGabor Kovesdan p_end = fillnew - 1; 9582dd076b8SGabor Kovesdan malformed(); 9592dd076b8SGabor Kovesdan } 9602dd076b8SGabor Kovesdan p_char[fillold] = ch; 9612dd076b8SGabor Kovesdan p_line[fillold] = s; 9622dd076b8SGabor Kovesdan p_len[fillold++] = strlen(s); 9632dd076b8SGabor Kovesdan if (fillold > p_ptrn_lines) { 9642dd076b8SGabor Kovesdan if (remove_special_line()) { 9652dd076b8SGabor Kovesdan p_len[fillold - 1] -= 1; 9662dd076b8SGabor Kovesdan s[p_len[fillold - 1]] = 0; 9672dd076b8SGabor Kovesdan } 9682dd076b8SGabor Kovesdan } 9692dd076b8SGabor Kovesdan break; 9702dd076b8SGabor Kovesdan case '=': 9712dd076b8SGabor Kovesdan ch = ' '; 9722dd076b8SGabor Kovesdan /* FALL THROUGH */ 9732dd076b8SGabor Kovesdan case ' ': 9742dd076b8SGabor Kovesdan if (fillold > p_ptrn_lines) { 9752dd076b8SGabor Kovesdan free(s); 9762dd076b8SGabor Kovesdan while (--fillnew > p_ptrn_lines) 9772dd076b8SGabor Kovesdan free(p_line[fillnew]); 9782dd076b8SGabor Kovesdan p_end = fillold - 1; 9792dd076b8SGabor Kovesdan malformed(); 9802dd076b8SGabor Kovesdan } 9812dd076b8SGabor Kovesdan context++; 9822dd076b8SGabor Kovesdan p_char[fillold] = ch; 9832dd076b8SGabor Kovesdan p_line[fillold] = s; 9842dd076b8SGabor Kovesdan p_len[fillold++] = strlen(s); 9852dd076b8SGabor Kovesdan s = savestr(s); 9862dd076b8SGabor Kovesdan if (out_of_mem) { 9872dd076b8SGabor Kovesdan while (--fillnew > p_ptrn_lines) 9882dd076b8SGabor Kovesdan free(p_line[fillnew]); 9892dd076b8SGabor Kovesdan p_end = fillold - 1; 9902dd076b8SGabor Kovesdan return false; 9912dd076b8SGabor Kovesdan } 9922dd076b8SGabor Kovesdan if (fillold > p_ptrn_lines) { 9932dd076b8SGabor Kovesdan if (remove_special_line()) { 9942dd076b8SGabor Kovesdan p_len[fillold - 1] -= 1; 9952dd076b8SGabor Kovesdan s[p_len[fillold - 1]] = 0; 9962dd076b8SGabor Kovesdan } 9972dd076b8SGabor Kovesdan } 9982dd076b8SGabor Kovesdan /* FALL THROUGH */ 9992dd076b8SGabor Kovesdan case '+': 10002dd076b8SGabor Kovesdan if (fillnew > p_end) { 10012dd076b8SGabor Kovesdan free(s); 10022dd076b8SGabor Kovesdan while (--fillnew > p_ptrn_lines) 10032dd076b8SGabor Kovesdan free(p_line[fillnew]); 10042dd076b8SGabor Kovesdan p_end = fillold - 1; 10052dd076b8SGabor Kovesdan malformed(); 10062dd076b8SGabor Kovesdan } 10072dd076b8SGabor Kovesdan p_char[fillnew] = ch; 10082dd076b8SGabor Kovesdan p_line[fillnew] = s; 10092dd076b8SGabor Kovesdan p_len[fillnew++] = strlen(s); 10102dd076b8SGabor Kovesdan if (fillold > p_ptrn_lines) { 10112dd076b8SGabor Kovesdan if (remove_special_line()) { 10122dd076b8SGabor Kovesdan p_len[fillnew - 1] -= 1; 10132dd076b8SGabor Kovesdan s[p_len[fillnew - 1]] = 0; 10142dd076b8SGabor Kovesdan } 10152dd076b8SGabor Kovesdan } 10162dd076b8SGabor Kovesdan break; 10172dd076b8SGabor Kovesdan default: 10182dd076b8SGabor Kovesdan p_end = fillnew; 10192dd076b8SGabor Kovesdan malformed(); 10202dd076b8SGabor Kovesdan } 10212dd076b8SGabor Kovesdan if (ch != ' ' && context > 0) { 10222dd076b8SGabor Kovesdan if (context < p_context) 10232dd076b8SGabor Kovesdan p_context = context; 10242dd076b8SGabor Kovesdan context = -1000; 10252dd076b8SGabor Kovesdan } 10262dd076b8SGabor Kovesdan } /* while */ 10272dd076b8SGabor Kovesdan } else { /* normal diff--fake it up */ 10282dd076b8SGabor Kovesdan char hunk_type; 10292dd076b8SGabor Kovesdan int i; 10302dd076b8SGabor Kovesdan LINENUM min, max; 10312dd076b8SGabor Kovesdan 1032e91a64deSPedro F. Giffuni line_beginning = ftello(pfp); 10332dd076b8SGabor Kovesdan p_context = 0; 10342dd076b8SGabor Kovesdan len = pgets(true); 10352dd076b8SGabor Kovesdan p_input_line++; 10362dd076b8SGabor Kovesdan if (len == 0 || !isdigit((unsigned char)*buf)) { 10372dd076b8SGabor Kovesdan next_intuit_at(line_beginning, p_input_line); 10382dd076b8SGabor Kovesdan return false; 10392dd076b8SGabor Kovesdan } 1040d3fc0cb8SPedro F. Giffuni p_first = strtolinenum(buf, &s); 10412dd076b8SGabor Kovesdan if (*s == ',') { 1042d3fc0cb8SPedro F. Giffuni p_ptrn_lines = strtolinenum(s + 1, &s) - p_first + 1; 1043d3fc0cb8SPedro F. Giffuni if (p_ptrn_lines < 0) 1044d3fc0cb8SPedro F. Giffuni malformed(); 10452dd076b8SGabor Kovesdan } else 10462dd076b8SGabor Kovesdan p_ptrn_lines = (*s != 'a'); 10472dd076b8SGabor Kovesdan hunk_type = *s; 10482dd076b8SGabor Kovesdan if (hunk_type == 'a') 10492dd076b8SGabor Kovesdan p_first++; /* do append rather than insert */ 1050d3fc0cb8SPedro F. Giffuni min = strtolinenum(s + 1, &s); 10512dd076b8SGabor Kovesdan if (*s == ',') 1052d3fc0cb8SPedro F. Giffuni max = strtolinenum(s + 1, &s); 10532dd076b8SGabor Kovesdan else 10542dd076b8SGabor Kovesdan max = min; 1055d3fc0cb8SPedro F. Giffuni if (min < 0 || min > max || max - min == LINENUM_MAX) 1056d3fc0cb8SPedro F. Giffuni malformed(); 10572dd076b8SGabor Kovesdan if (hunk_type == 'd') 10582dd076b8SGabor Kovesdan min++; 1059d3fc0cb8SPedro F. Giffuni p_newfirst = min; 1060d3fc0cb8SPedro F. Giffuni p_repl_lines = max - min + 1; 1061d3fc0cb8SPedro F. Giffuni if (p_newfirst > LINENUM_MAX - p_repl_lines || 1062d3fc0cb8SPedro F. Giffuni p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1) 1063d3fc0cb8SPedro F. Giffuni malformed(); 1064d3fc0cb8SPedro F. Giffuni p_end = p_ptrn_lines + p_repl_lines + 1; 10652dd076b8SGabor Kovesdan if (p_end > MAXHUNKSIZE) 10662dd076b8SGabor Kovesdan fatal("hunk too large (%ld lines) at line %ld: %s", 10672dd076b8SGabor Kovesdan p_end, p_input_line, buf); 10682dd076b8SGabor Kovesdan while (p_end >= hunkmax) 10692dd076b8SGabor Kovesdan grow_hunkmax(); 10702dd076b8SGabor Kovesdan snprintf(buf, buf_size, "*** %ld,%ld\n", p_first, 10712dd076b8SGabor Kovesdan p_first + p_ptrn_lines - 1); 10722dd076b8SGabor Kovesdan p_line[0] = savestr(buf); 10732dd076b8SGabor Kovesdan if (out_of_mem) { 10742dd076b8SGabor Kovesdan p_end = -1; 10752dd076b8SGabor Kovesdan return false; 10762dd076b8SGabor Kovesdan } 10772dd076b8SGabor Kovesdan p_char[0] = '*'; 10782dd076b8SGabor Kovesdan for (i = 1; i <= p_ptrn_lines; i++) { 10792dd076b8SGabor Kovesdan len = pgets(true); 10802dd076b8SGabor Kovesdan p_input_line++; 10812dd076b8SGabor Kovesdan if (len == 0) 10822dd076b8SGabor Kovesdan fatal("unexpected end of file in patch at line %ld\n", 10832dd076b8SGabor Kovesdan p_input_line); 10842dd076b8SGabor Kovesdan if (*buf != '<') 10852dd076b8SGabor Kovesdan fatal("< expected at line %ld of patch\n", 10862dd076b8SGabor Kovesdan p_input_line); 10872dd076b8SGabor Kovesdan p_line[i] = savestr(buf + 2); 10882dd076b8SGabor Kovesdan if (out_of_mem) { 10892dd076b8SGabor Kovesdan p_end = i - 1; 10902dd076b8SGabor Kovesdan return false; 10912dd076b8SGabor Kovesdan } 10922dd076b8SGabor Kovesdan p_len[i] = strlen(p_line[i]); 10932dd076b8SGabor Kovesdan p_char[i] = '-'; 10942dd076b8SGabor Kovesdan } 10952dd076b8SGabor Kovesdan 10962dd076b8SGabor Kovesdan if (remove_special_line()) { 10972dd076b8SGabor Kovesdan p_len[i - 1] -= 1; 10982dd076b8SGabor Kovesdan (p_line[i - 1])[p_len[i - 1]] = 0; 10992dd076b8SGabor Kovesdan } 11002dd076b8SGabor Kovesdan if (hunk_type == 'c') { 11012dd076b8SGabor Kovesdan len = pgets(true); 11022dd076b8SGabor Kovesdan p_input_line++; 11032dd076b8SGabor Kovesdan if (len == 0) 11042dd076b8SGabor Kovesdan fatal("unexpected end of file in patch at line %ld\n", 11052dd076b8SGabor Kovesdan p_input_line); 11062dd076b8SGabor Kovesdan if (*buf != '-') 11072dd076b8SGabor Kovesdan fatal("--- expected at line %ld of patch\n", 11082dd076b8SGabor Kovesdan p_input_line); 11092dd076b8SGabor Kovesdan } 11102dd076b8SGabor Kovesdan snprintf(buf, buf_size, "--- %ld,%ld\n", min, max); 11112dd076b8SGabor Kovesdan p_line[i] = savestr(buf); 11122dd076b8SGabor Kovesdan if (out_of_mem) { 11132dd076b8SGabor Kovesdan p_end = i - 1; 11142dd076b8SGabor Kovesdan return false; 11152dd076b8SGabor Kovesdan } 11162dd076b8SGabor Kovesdan p_char[i] = '='; 11172dd076b8SGabor Kovesdan for (i++; i <= p_end; i++) { 11182dd076b8SGabor Kovesdan len = pgets(true); 11192dd076b8SGabor Kovesdan p_input_line++; 11202dd076b8SGabor Kovesdan if (len == 0) 11212dd076b8SGabor Kovesdan fatal("unexpected end of file in patch at line %ld\n", 11222dd076b8SGabor Kovesdan p_input_line); 11232dd076b8SGabor Kovesdan if (*buf != '>') 11242dd076b8SGabor Kovesdan fatal("> expected at line %ld of patch\n", 11252dd076b8SGabor Kovesdan p_input_line); 11262dd076b8SGabor Kovesdan p_line[i] = savestr(buf + 2); 11272dd076b8SGabor Kovesdan if (out_of_mem) { 11282dd076b8SGabor Kovesdan p_end = i - 1; 11292dd076b8SGabor Kovesdan return false; 11302dd076b8SGabor Kovesdan } 11312dd076b8SGabor Kovesdan p_len[i] = strlen(p_line[i]); 11322dd076b8SGabor Kovesdan p_char[i] = '+'; 11332dd076b8SGabor Kovesdan } 11342dd076b8SGabor Kovesdan 11352dd076b8SGabor Kovesdan if (remove_special_line()) { 11362dd076b8SGabor Kovesdan p_len[i - 1] -= 1; 11372dd076b8SGabor Kovesdan (p_line[i - 1])[p_len[i - 1]] = 0; 11382dd076b8SGabor Kovesdan } 11392dd076b8SGabor Kovesdan } 11402dd076b8SGabor Kovesdan if (reverse) /* backwards patch? */ 11412dd076b8SGabor Kovesdan if (!pch_swap()) 11422dd076b8SGabor Kovesdan say("Not enough memory to swap next hunk!\n"); 11432dd076b8SGabor Kovesdan #ifdef DEBUGGING 11442dd076b8SGabor Kovesdan if (debug & 2) { 11452dd076b8SGabor Kovesdan int i; 11462dd076b8SGabor Kovesdan char special; 11472dd076b8SGabor Kovesdan 11482dd076b8SGabor Kovesdan for (i = 0; i <= p_end; i++) { 11492dd076b8SGabor Kovesdan if (i == p_ptrn_lines) 11502dd076b8SGabor Kovesdan special = '^'; 11512dd076b8SGabor Kovesdan else 11522dd076b8SGabor Kovesdan special = ' '; 11532dd076b8SGabor Kovesdan fprintf(stderr, "%3d %c %c %s", i, p_char[i], 11542dd076b8SGabor Kovesdan special, p_line[i]); 11552dd076b8SGabor Kovesdan fflush(stderr); 11562dd076b8SGabor Kovesdan } 11572dd076b8SGabor Kovesdan } 11582dd076b8SGabor Kovesdan #endif 11592dd076b8SGabor Kovesdan if (p_end + 1 < hunkmax)/* paranoia reigns supreme... */ 11602dd076b8SGabor Kovesdan p_char[p_end + 1] = '^'; /* add a stopper for apply_hunk */ 11612dd076b8SGabor Kovesdan return true; 11622dd076b8SGabor Kovesdan } 11632dd076b8SGabor Kovesdan 11642dd076b8SGabor Kovesdan /* 11652dd076b8SGabor Kovesdan * Input a line from the patch file. 11662dd076b8SGabor Kovesdan * Worry about indentation if do_indent is true. 11672dd076b8SGabor Kovesdan * The line is read directly into the buf global variable which 11682dd076b8SGabor Kovesdan * is resized if necessary in order to hold the complete line. 11692dd076b8SGabor Kovesdan * Returns the number of characters read including the terminating 11702dd076b8SGabor Kovesdan * '\n', if any. 11712dd076b8SGabor Kovesdan */ 11722dd076b8SGabor Kovesdan size_t 11732dd076b8SGabor Kovesdan pgets(bool do_indent) 11742dd076b8SGabor Kovesdan { 11752dd076b8SGabor Kovesdan char *line; 11762dd076b8SGabor Kovesdan size_t len; 11772dd076b8SGabor Kovesdan int indent = 0, skipped = 0; 11782dd076b8SGabor Kovesdan 11792dd076b8SGabor Kovesdan line = fgetln(pfp, &len); 11802dd076b8SGabor Kovesdan if (line != NULL) { 11812dd076b8SGabor Kovesdan if (len + 1 > buf_size) { 11822dd076b8SGabor Kovesdan while (len + 1 > buf_size) 11832dd076b8SGabor Kovesdan buf_size *= 2; 11842dd076b8SGabor Kovesdan free(buf); 11852dd076b8SGabor Kovesdan buf = malloc(buf_size); 11862dd076b8SGabor Kovesdan if (buf == NULL) 11872dd076b8SGabor Kovesdan fatal("out of memory\n"); 11882dd076b8SGabor Kovesdan } 11892dd076b8SGabor Kovesdan if (do_indent == 1 && p_indent) { 11902dd076b8SGabor Kovesdan for (; 11912dd076b8SGabor Kovesdan indent < p_indent && (*line == ' ' || *line == '\t' || *line == 'X'); 11922dd076b8SGabor Kovesdan line++, skipped++) { 11932dd076b8SGabor Kovesdan if (*line == '\t') 11942dd076b8SGabor Kovesdan indent += 8 - (indent %7); 11952dd076b8SGabor Kovesdan else 11962dd076b8SGabor Kovesdan indent++; 11972dd076b8SGabor Kovesdan } 11982dd076b8SGabor Kovesdan } 11996d85e39bSDavid E. O'Brien memcpy(buf, line, len - skipped); 12002dd076b8SGabor Kovesdan buf[len - skipped] = '\0'; 12012dd076b8SGabor Kovesdan } 12022dd076b8SGabor Kovesdan return len; 12032dd076b8SGabor Kovesdan } 12042dd076b8SGabor Kovesdan 12052dd076b8SGabor Kovesdan 12062dd076b8SGabor Kovesdan /* 12072dd076b8SGabor Kovesdan * Reverse the old and new portions of the current hunk. 12082dd076b8SGabor Kovesdan */ 12092dd076b8SGabor Kovesdan bool 12102dd076b8SGabor Kovesdan pch_swap(void) 12112dd076b8SGabor Kovesdan { 12122dd076b8SGabor Kovesdan char **tp_line; /* the text of the hunk */ 1213c1a08643SPedro F. Giffuni unsigned short *tp_len;/* length of each line */ 12142dd076b8SGabor Kovesdan char *tp_char; /* +, -, and ! */ 12152dd076b8SGabor Kovesdan LINENUM i; 12162dd076b8SGabor Kovesdan LINENUM n; 12172dd076b8SGabor Kovesdan bool blankline = false; 12182dd076b8SGabor Kovesdan char *s; 12192dd076b8SGabor Kovesdan 12202dd076b8SGabor Kovesdan i = p_first; 12212dd076b8SGabor Kovesdan p_first = p_newfirst; 12222dd076b8SGabor Kovesdan p_newfirst = i; 12232dd076b8SGabor Kovesdan 12242dd076b8SGabor Kovesdan /* make a scratch copy */ 12252dd076b8SGabor Kovesdan 12262dd076b8SGabor Kovesdan tp_line = p_line; 12272dd076b8SGabor Kovesdan tp_len = p_len; 12282dd076b8SGabor Kovesdan tp_char = p_char; 12292dd076b8SGabor Kovesdan p_line = NULL; /* force set_hunkmax to allocate again */ 12302dd076b8SGabor Kovesdan p_len = NULL; 12312dd076b8SGabor Kovesdan p_char = NULL; 12322dd076b8SGabor Kovesdan set_hunkmax(); 12332dd076b8SGabor Kovesdan if (p_line == NULL || p_len == NULL || p_char == NULL) { 12342dd076b8SGabor Kovesdan 12352dd076b8SGabor Kovesdan free(p_line); 12362dd076b8SGabor Kovesdan p_line = tp_line; 12372dd076b8SGabor Kovesdan free(p_len); 12382dd076b8SGabor Kovesdan p_len = tp_len; 12392dd076b8SGabor Kovesdan free(p_char); 12402dd076b8SGabor Kovesdan p_char = tp_char; 12412dd076b8SGabor Kovesdan return false; /* not enough memory to swap hunk! */ 12422dd076b8SGabor Kovesdan } 12432dd076b8SGabor Kovesdan /* now turn the new into the old */ 12442dd076b8SGabor Kovesdan 12452dd076b8SGabor Kovesdan i = p_ptrn_lines + 1; 12462dd076b8SGabor Kovesdan if (tp_char[i] == '\n') { /* account for possible blank line */ 12472dd076b8SGabor Kovesdan blankline = true; 12482dd076b8SGabor Kovesdan i++; 12492dd076b8SGabor Kovesdan } 12502dd076b8SGabor Kovesdan if (p_efake >= 0) { /* fix non-freeable ptr range */ 12512dd076b8SGabor Kovesdan if (p_efake <= i) 12522dd076b8SGabor Kovesdan n = p_end - i + 1; 12532dd076b8SGabor Kovesdan else 12542dd076b8SGabor Kovesdan n = -i; 12552dd076b8SGabor Kovesdan p_efake += n; 12562dd076b8SGabor Kovesdan p_bfake += n; 12572dd076b8SGabor Kovesdan } 12582dd076b8SGabor Kovesdan for (n = 0; i <= p_end; i++, n++) { 12592dd076b8SGabor Kovesdan p_line[n] = tp_line[i]; 12602dd076b8SGabor Kovesdan p_char[n] = tp_char[i]; 12612dd076b8SGabor Kovesdan if (p_char[n] == '+') 12622dd076b8SGabor Kovesdan p_char[n] = '-'; 12632dd076b8SGabor Kovesdan p_len[n] = tp_len[i]; 12642dd076b8SGabor Kovesdan } 12652dd076b8SGabor Kovesdan if (blankline) { 12662dd076b8SGabor Kovesdan i = p_ptrn_lines + 1; 12672dd076b8SGabor Kovesdan p_line[n] = tp_line[i]; 12682dd076b8SGabor Kovesdan p_char[n] = tp_char[i]; 12692dd076b8SGabor Kovesdan p_len[n] = tp_len[i]; 12702dd076b8SGabor Kovesdan n++; 12712dd076b8SGabor Kovesdan } 12722dd076b8SGabor Kovesdan if (p_char[0] != '=') 12732dd076b8SGabor Kovesdan fatal("Malformed patch at line %ld: expected '=' found '%c'\n", 12742dd076b8SGabor Kovesdan p_input_line, p_char[0]); 12752dd076b8SGabor Kovesdan p_char[0] = '*'; 12762dd076b8SGabor Kovesdan for (s = p_line[0]; *s; s++) 12772dd076b8SGabor Kovesdan if (*s == '-') 12782dd076b8SGabor Kovesdan *s = '*'; 12792dd076b8SGabor Kovesdan 12802dd076b8SGabor Kovesdan /* now turn the old into the new */ 12812dd076b8SGabor Kovesdan 12822dd076b8SGabor Kovesdan if (p_char[0] != '*') 12832dd076b8SGabor Kovesdan fatal("Malformed patch at line %ld: expected '*' found '%c'\n", 12842dd076b8SGabor Kovesdan p_input_line, p_char[0]); 12852dd076b8SGabor Kovesdan tp_char[0] = '='; 12862dd076b8SGabor Kovesdan for (s = tp_line[0]; *s; s++) 12872dd076b8SGabor Kovesdan if (*s == '*') 12882dd076b8SGabor Kovesdan *s = '-'; 12892dd076b8SGabor Kovesdan for (i = 0; n <= p_end; i++, n++) { 12902dd076b8SGabor Kovesdan p_line[n] = tp_line[i]; 12912dd076b8SGabor Kovesdan p_char[n] = tp_char[i]; 12922dd076b8SGabor Kovesdan if (p_char[n] == '-') 12932dd076b8SGabor Kovesdan p_char[n] = '+'; 12942dd076b8SGabor Kovesdan p_len[n] = tp_len[i]; 12952dd076b8SGabor Kovesdan } 12962dd076b8SGabor Kovesdan 12972dd076b8SGabor Kovesdan if (i != p_ptrn_lines + 1) 12982dd076b8SGabor Kovesdan fatal("Malformed patch at line %ld: expected %ld lines, " 12992dd076b8SGabor Kovesdan "got %ld\n", 13002dd076b8SGabor Kovesdan p_input_line, p_ptrn_lines + 1, i); 13012dd076b8SGabor Kovesdan 13022dd076b8SGabor Kovesdan i = p_ptrn_lines; 13032dd076b8SGabor Kovesdan p_ptrn_lines = p_repl_lines; 13042dd076b8SGabor Kovesdan p_repl_lines = i; 13052dd076b8SGabor Kovesdan 13062dd076b8SGabor Kovesdan free(tp_line); 13072dd076b8SGabor Kovesdan free(tp_len); 13082dd076b8SGabor Kovesdan free(tp_char); 13092dd076b8SGabor Kovesdan 13102dd076b8SGabor Kovesdan return true; 13112dd076b8SGabor Kovesdan } 13122dd076b8SGabor Kovesdan 13132dd076b8SGabor Kovesdan /* 13142dd076b8SGabor Kovesdan * Return the specified line position in the old file of the old context. 13152dd076b8SGabor Kovesdan */ 13162dd076b8SGabor Kovesdan LINENUM 13172dd076b8SGabor Kovesdan pch_first(void) 13182dd076b8SGabor Kovesdan { 13192dd076b8SGabor Kovesdan return p_first; 13202dd076b8SGabor Kovesdan } 13212dd076b8SGabor Kovesdan 13222dd076b8SGabor Kovesdan /* 13232dd076b8SGabor Kovesdan * Return the number of lines of old context. 13242dd076b8SGabor Kovesdan */ 13252dd076b8SGabor Kovesdan LINENUM 13262dd076b8SGabor Kovesdan pch_ptrn_lines(void) 13272dd076b8SGabor Kovesdan { 13282dd076b8SGabor Kovesdan return p_ptrn_lines; 13292dd076b8SGabor Kovesdan } 13302dd076b8SGabor Kovesdan 13312dd076b8SGabor Kovesdan /* 13322dd076b8SGabor Kovesdan * Return the probable line position in the new file of the first line. 13332dd076b8SGabor Kovesdan */ 13342dd076b8SGabor Kovesdan LINENUM 13352dd076b8SGabor Kovesdan pch_newfirst(void) 13362dd076b8SGabor Kovesdan { 13372dd076b8SGabor Kovesdan return p_newfirst; 13382dd076b8SGabor Kovesdan } 13392dd076b8SGabor Kovesdan 13402dd076b8SGabor Kovesdan /* 13412dd076b8SGabor Kovesdan * Return the number of lines in the replacement text including context. 13422dd076b8SGabor Kovesdan */ 13432dd076b8SGabor Kovesdan LINENUM 13442dd076b8SGabor Kovesdan pch_repl_lines(void) 13452dd076b8SGabor Kovesdan { 13462dd076b8SGabor Kovesdan return p_repl_lines; 13472dd076b8SGabor Kovesdan } 13482dd076b8SGabor Kovesdan 13492dd076b8SGabor Kovesdan /* 13502dd076b8SGabor Kovesdan * Return the number of lines in the whole hunk. 13512dd076b8SGabor Kovesdan */ 13522dd076b8SGabor Kovesdan LINENUM 13532dd076b8SGabor Kovesdan pch_end(void) 13542dd076b8SGabor Kovesdan { 13552dd076b8SGabor Kovesdan return p_end; 13562dd076b8SGabor Kovesdan } 13572dd076b8SGabor Kovesdan 13582dd076b8SGabor Kovesdan /* 13592dd076b8SGabor Kovesdan * Return the number of context lines before the first changed line. 13602dd076b8SGabor Kovesdan */ 13612dd076b8SGabor Kovesdan LINENUM 13622dd076b8SGabor Kovesdan pch_context(void) 13632dd076b8SGabor Kovesdan { 13642dd076b8SGabor Kovesdan return p_context; 13652dd076b8SGabor Kovesdan } 13662dd076b8SGabor Kovesdan 13672dd076b8SGabor Kovesdan /* 13682dd076b8SGabor Kovesdan * Return the length of a particular patch line. 13692dd076b8SGabor Kovesdan */ 1370c1a08643SPedro F. Giffuni unsigned short 13712dd076b8SGabor Kovesdan pch_line_len(LINENUM line) 13722dd076b8SGabor Kovesdan { 13732dd076b8SGabor Kovesdan return p_len[line]; 13742dd076b8SGabor Kovesdan } 13752dd076b8SGabor Kovesdan 13762dd076b8SGabor Kovesdan /* 13772dd076b8SGabor Kovesdan * Return the control character (+, -, *, !, etc) for a patch line. 13782dd076b8SGabor Kovesdan */ 13792dd076b8SGabor Kovesdan char 13802dd076b8SGabor Kovesdan pch_char(LINENUM line) 13812dd076b8SGabor Kovesdan { 13822dd076b8SGabor Kovesdan return p_char[line]; 13832dd076b8SGabor Kovesdan } 13842dd076b8SGabor Kovesdan 13852dd076b8SGabor Kovesdan /* 13862dd076b8SGabor Kovesdan * Return a pointer to a particular patch line. 13872dd076b8SGabor Kovesdan */ 13882dd076b8SGabor Kovesdan char * 13892dd076b8SGabor Kovesdan pfetch(LINENUM line) 13902dd076b8SGabor Kovesdan { 13912dd076b8SGabor Kovesdan return p_line[line]; 13922dd076b8SGabor Kovesdan } 13932dd076b8SGabor Kovesdan 13942dd076b8SGabor Kovesdan /* 13952dd076b8SGabor Kovesdan * Return where in the patch file this hunk began, for error messages. 13962dd076b8SGabor Kovesdan */ 13972dd076b8SGabor Kovesdan LINENUM 13982dd076b8SGabor Kovesdan pch_hunk_beg(void) 13992dd076b8SGabor Kovesdan { 14002dd076b8SGabor Kovesdan return p_hunk_beg; 14012dd076b8SGabor Kovesdan } 14022dd076b8SGabor Kovesdan 14032dd076b8SGabor Kovesdan /* 14042dd076b8SGabor Kovesdan * Apply an ed script by feeding ed itself. 14052dd076b8SGabor Kovesdan */ 14062dd076b8SGabor Kovesdan void 14072dd076b8SGabor Kovesdan do_ed_script(void) 14082dd076b8SGabor Kovesdan { 14092dd076b8SGabor Kovesdan char *t; 1410e91a64deSPedro F. Giffuni off_t beginning_of_this_line; 14112dd076b8SGabor Kovesdan FILE *pipefp = NULL; 14122dd076b8SGabor Kovesdan 14132dd076b8SGabor Kovesdan if (!skip_rest_of_patch) { 14142dd076b8SGabor Kovesdan if (copy_file(filearg[0], TMPOUTNAME) < 0) { 14152dd076b8SGabor Kovesdan unlink(TMPOUTNAME); 14162dd076b8SGabor Kovesdan fatal("can't create temp file %s", TMPOUTNAME); 14172dd076b8SGabor Kovesdan } 14182dd076b8SGabor Kovesdan snprintf(buf, buf_size, "%s%s%s", _PATH_ED, 14192dd076b8SGabor Kovesdan verbose ? " " : " -s ", TMPOUTNAME); 14202dd076b8SGabor Kovesdan pipefp = popen(buf, "w"); 14212dd076b8SGabor Kovesdan } 14222dd076b8SGabor Kovesdan for (;;) { 1423e91a64deSPedro F. Giffuni beginning_of_this_line = ftello(pfp); 14242dd076b8SGabor Kovesdan if (pgets(true) == 0) { 14252dd076b8SGabor Kovesdan next_intuit_at(beginning_of_this_line, p_input_line); 14262dd076b8SGabor Kovesdan break; 14272dd076b8SGabor Kovesdan } 14282dd076b8SGabor Kovesdan p_input_line++; 14292dd076b8SGabor Kovesdan for (t = buf; isdigit((unsigned char)*t) || *t == ','; t++) 14302dd076b8SGabor Kovesdan ; 14312dd076b8SGabor Kovesdan /* POSIX defines allowed commands as {a,c,d,i,s} */ 14322b468ebaSPedro F. Giffuni if (isdigit((unsigned char)*buf) && 14332b468ebaSPedro F. Giffuni (*t == 'a' || *t == 'c' || *t == 'd' || *t == 'i' || *t == 's')) { 14342dd076b8SGabor Kovesdan if (pipefp != NULL) 14352dd076b8SGabor Kovesdan fputs(buf, pipefp); 14362dd076b8SGabor Kovesdan if (*t != 'd') { 14372dd076b8SGabor Kovesdan while (pgets(true)) { 14382dd076b8SGabor Kovesdan p_input_line++; 14392dd076b8SGabor Kovesdan if (pipefp != NULL) 14402dd076b8SGabor Kovesdan fputs(buf, pipefp); 14412dd076b8SGabor Kovesdan if (strEQ(buf, ".\n")) 14422dd076b8SGabor Kovesdan break; 14432dd076b8SGabor Kovesdan } 14442dd076b8SGabor Kovesdan } 14452dd076b8SGabor Kovesdan } else { 14462dd076b8SGabor Kovesdan next_intuit_at(beginning_of_this_line, p_input_line); 14472dd076b8SGabor Kovesdan break; 14482dd076b8SGabor Kovesdan } 14492dd076b8SGabor Kovesdan } 14502dd076b8SGabor Kovesdan if (pipefp == NULL) 14512dd076b8SGabor Kovesdan return; 14522dd076b8SGabor Kovesdan fprintf(pipefp, "w\n"); 14532dd076b8SGabor Kovesdan fprintf(pipefp, "q\n"); 14542dd076b8SGabor Kovesdan fflush(pipefp); 14552dd076b8SGabor Kovesdan pclose(pipefp); 14562dd076b8SGabor Kovesdan ignore_signals(); 14572dd076b8SGabor Kovesdan if (!check_only) { 14582dd076b8SGabor Kovesdan if (move_file(TMPOUTNAME, outname) < 0) { 14592dd076b8SGabor Kovesdan toutkeep = true; 14602dd076b8SGabor Kovesdan chmod(TMPOUTNAME, filemode); 14612dd076b8SGabor Kovesdan } else 14622dd076b8SGabor Kovesdan chmod(outname, filemode); 14632dd076b8SGabor Kovesdan } 14642dd076b8SGabor Kovesdan set_signals(1); 14652dd076b8SGabor Kovesdan } 14662dd076b8SGabor Kovesdan 14672dd076b8SGabor Kovesdan /* 14682dd076b8SGabor Kovesdan * Choose the name of the file to be patched based on POSIX rules. 14692dd076b8SGabor Kovesdan * NOTE: the POSIX rules are amazingly stupid and we only follow them 14702dd076b8SGabor Kovesdan * if the user specified --posix or set POSIXLY_CORRECT. 14712dd076b8SGabor Kovesdan */ 14722dd076b8SGabor Kovesdan static char * 14732dd076b8SGabor Kovesdan posix_name(const struct file_name *names, bool assume_exists) 14742dd076b8SGabor Kovesdan { 14752dd076b8SGabor Kovesdan char *path = NULL; 14762dd076b8SGabor Kovesdan int i; 14772dd076b8SGabor Kovesdan 14782dd076b8SGabor Kovesdan /* 14792dd076b8SGabor Kovesdan * POSIX states that the filename will be chosen from one 14802dd076b8SGabor Kovesdan * of the old, new and index names (in that order) if 14812dd076b8SGabor Kovesdan * the file exists relative to CWD after -p stripping. 14822dd076b8SGabor Kovesdan */ 14832dd076b8SGabor Kovesdan for (i = 0; i < MAX_FILE; i++) { 14842dd076b8SGabor Kovesdan if (names[i].path != NULL && names[i].exists) { 14852dd076b8SGabor Kovesdan path = names[i].path; 14862dd076b8SGabor Kovesdan break; 14872dd076b8SGabor Kovesdan } 14882dd076b8SGabor Kovesdan } 14892dd076b8SGabor Kovesdan if (path == NULL && !assume_exists) { 14902dd076b8SGabor Kovesdan /* 14912dd076b8SGabor Kovesdan * No files found, look for something we can checkout from 14922dd076b8SGabor Kovesdan * RCS/SCCS dirs. Same order as above. 14932dd076b8SGabor Kovesdan */ 14942dd076b8SGabor Kovesdan for (i = 0; i < MAX_FILE; i++) { 14952dd076b8SGabor Kovesdan if (names[i].path != NULL && 14962dd076b8SGabor Kovesdan (path = checked_in(names[i].path)) != NULL) 14972dd076b8SGabor Kovesdan break; 14982dd076b8SGabor Kovesdan } 14992dd076b8SGabor Kovesdan /* 15002dd076b8SGabor Kovesdan * Still no match? Check to see if the diff could be creating 15012dd076b8SGabor Kovesdan * a new file. 15022dd076b8SGabor Kovesdan */ 15032dd076b8SGabor Kovesdan if (path == NULL && ok_to_create_file && 15042dd076b8SGabor Kovesdan names[NEW_FILE].path != NULL) 15052dd076b8SGabor Kovesdan path = names[NEW_FILE].path; 15062dd076b8SGabor Kovesdan } 15072dd076b8SGabor Kovesdan 1508*547e0acbSPedro F. Giffuni return path ? xstrdup(path) : NULL; 15092dd076b8SGabor Kovesdan } 15102dd076b8SGabor Kovesdan 15112dd076b8SGabor Kovesdan static char * 151279d8aaa9SStefan Eßer compare_names(const struct file_name *names, bool assume_exists, int phase) 15132dd076b8SGabor Kovesdan { 15142dd076b8SGabor Kovesdan size_t min_components, min_baselen, min_len, tmp; 15152dd076b8SGabor Kovesdan char *best = NULL; 151679d8aaa9SStefan Eßer char *path; 15172dd076b8SGabor Kovesdan int i; 15182dd076b8SGabor Kovesdan 15192dd076b8SGabor Kovesdan /* 15202dd076b8SGabor Kovesdan * The "best" name is the one with the fewest number of path 15212dd076b8SGabor Kovesdan * components, the shortest basename length, and the shortest 15222dd076b8SGabor Kovesdan * overall length (in that order). We only use the Index: file 15232dd076b8SGabor Kovesdan * if neither of the old or new files could be intuited from 15242dd076b8SGabor Kovesdan * the diff header. 15252dd076b8SGabor Kovesdan */ 15262dd076b8SGabor Kovesdan min_components = min_baselen = min_len = SIZE_MAX; 15272dd076b8SGabor Kovesdan for (i = INDEX_FILE; i >= OLD_FILE; i--) { 152879d8aaa9SStefan Eßer path = names[i].path; 152979d8aaa9SStefan Eßer if (path == NULL || 153079d8aaa9SStefan Eßer (phase == 1 && !names[i].exists && !assume_exists) || 153179d8aaa9SStefan Eßer (phase == 2 && checked_in(path) == NULL)) 15322dd076b8SGabor Kovesdan continue; 153379d8aaa9SStefan Eßer if ((tmp = num_components(path)) > min_components) 15342dd076b8SGabor Kovesdan continue; 15356b239879SStefan Eßer if (tmp < min_components) { 15362dd076b8SGabor Kovesdan min_components = tmp; 153779d8aaa9SStefan Eßer best = path; 15386b239879SStefan Eßer } 153979d8aaa9SStefan Eßer if ((tmp = strlen(basename(path))) > min_baselen) 15402dd076b8SGabor Kovesdan continue; 15416b239879SStefan Eßer if (tmp < min_baselen) { 15422dd076b8SGabor Kovesdan min_baselen = tmp; 154379d8aaa9SStefan Eßer best = path; 15446b239879SStefan Eßer } 154579d8aaa9SStefan Eßer if ((tmp = strlen(path)) > min_len) 15462dd076b8SGabor Kovesdan continue; 15472dd076b8SGabor Kovesdan min_len = tmp; 154879d8aaa9SStefan Eßer best = path; 15492dd076b8SGabor Kovesdan } 155079d8aaa9SStefan Eßer return best; 155179d8aaa9SStefan Eßer } 155279d8aaa9SStefan Eßer 15532dd076b8SGabor Kovesdan /* 155479d8aaa9SStefan Eßer * Choose the name of the file to be patched based the "best" one 155579d8aaa9SStefan Eßer * available. 15562dd076b8SGabor Kovesdan */ 155779d8aaa9SStefan Eßer static char * 155879d8aaa9SStefan Eßer best_name(const struct file_name *names, bool assume_exists) 155979d8aaa9SStefan Eßer { 156079d8aaa9SStefan Eßer char *best; 156179d8aaa9SStefan Eßer 156279d8aaa9SStefan Eßer best = compare_names(names, assume_exists, 1); 156379d8aaa9SStefan Eßer if (best == NULL) { 156479d8aaa9SStefan Eßer best = compare_names(names, assume_exists, 2); 15652dd076b8SGabor Kovesdan /* 15662dd076b8SGabor Kovesdan * Still no match? Check to see if the diff could be creating 15672dd076b8SGabor Kovesdan * a new file. 15682dd076b8SGabor Kovesdan */ 15692dd076b8SGabor Kovesdan if (best == NULL && ok_to_create_file && 15702dd076b8SGabor Kovesdan names[NEW_FILE].path != NULL) 15712dd076b8SGabor Kovesdan best = names[NEW_FILE].path; 15722dd076b8SGabor Kovesdan } 15732dd076b8SGabor Kovesdan 1574*547e0acbSPedro F. Giffuni return best ? xstrdup(best) : NULL; 15752dd076b8SGabor Kovesdan } 15762dd076b8SGabor Kovesdan 15772dd076b8SGabor Kovesdan static size_t 15782dd076b8SGabor Kovesdan num_components(const char *path) 15792dd076b8SGabor Kovesdan { 15802dd076b8SGabor Kovesdan size_t n; 15812dd076b8SGabor Kovesdan const char *cp; 15822dd076b8SGabor Kovesdan 15832dd076b8SGabor Kovesdan for (n = 0, cp = path; (cp = strchr(cp, '/')) != NULL; n++, cp++) { 15842dd076b8SGabor Kovesdan while (*cp == '/') 15852dd076b8SGabor Kovesdan cp++; /* skip consecutive slashes */ 15862dd076b8SGabor Kovesdan } 15872dd076b8SGabor Kovesdan return n; 15882dd076b8SGabor Kovesdan } 1589d3fc0cb8SPedro F. Giffuni 1590d3fc0cb8SPedro F. Giffuni /* 1591d3fc0cb8SPedro F. Giffuni * Convert number at NPTR into LINENUM and save address of first 1592d3fc0cb8SPedro F. Giffuni * character that is not a digit in ENDPTR. If conversion is not 1593d3fc0cb8SPedro F. Giffuni * possible, call fatal. 1594d3fc0cb8SPedro F. Giffuni */ 1595d3fc0cb8SPedro F. Giffuni static LINENUM 1596d3fc0cb8SPedro F. Giffuni strtolinenum(char *nptr, char **endptr) 1597d3fc0cb8SPedro F. Giffuni { 1598d3fc0cb8SPedro F. Giffuni LINENUM rv; 1599d3fc0cb8SPedro F. Giffuni char c; 1600d3fc0cb8SPedro F. Giffuni char *p; 1601d3fc0cb8SPedro F. Giffuni const char *errstr; 1602d3fc0cb8SPedro F. Giffuni 1603d3fc0cb8SPedro F. Giffuni for (p = nptr; isdigit((unsigned char)*p); p++) 1604d3fc0cb8SPedro F. Giffuni ; 1605d3fc0cb8SPedro F. Giffuni 1606d3fc0cb8SPedro F. Giffuni if (p == nptr) 1607d3fc0cb8SPedro F. Giffuni malformed(); 1608d3fc0cb8SPedro F. Giffuni 1609d3fc0cb8SPedro F. Giffuni c = *p; 1610d3fc0cb8SPedro F. Giffuni *p = '\0'; 1611d3fc0cb8SPedro F. Giffuni 1612d3fc0cb8SPedro F. Giffuni rv = strtonum(nptr, 0, LINENUM_MAX, &errstr); 1613d3fc0cb8SPedro F. Giffuni if (errstr != NULL) 1614d3fc0cb8SPedro F. Giffuni fatal("invalid line number at line %ld: `%s' is %s\n", 1615d3fc0cb8SPedro F. Giffuni p_input_line, nptr, errstr); 1616d3fc0cb8SPedro F. Giffuni 1617d3fc0cb8SPedro F. Giffuni *p = c; 1618d3fc0cb8SPedro F. Giffuni *endptr = p; 1619d3fc0cb8SPedro F. Giffuni 1620d3fc0cb8SPedro F. Giffuni return rv; 1621d3fc0cb8SPedro F. Giffuni } 1622