15027f2b8SJohn Marino /*-
248d201a5SJoerg Sonnenberger * Copyright 1986, Larry Wall
348d201a5SJoerg Sonnenberger *
448d201a5SJoerg Sonnenberger * Redistribution and use in source and binary forms, with or without
548d201a5SJoerg Sonnenberger * modification, are permitted provided that the following condition is met:
648d201a5SJoerg Sonnenberger * 1. Redistributions of source code must retain the above copyright notice,
748d201a5SJoerg Sonnenberger * this condition and the following disclaimer.
848d201a5SJoerg Sonnenberger *
948d201a5SJoerg Sonnenberger * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
1048d201a5SJoerg Sonnenberger * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1148d201a5SJoerg Sonnenberger * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1248d201a5SJoerg Sonnenberger * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
1348d201a5SJoerg Sonnenberger * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1448d201a5SJoerg Sonnenberger * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1548d201a5SJoerg Sonnenberger * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1648d201a5SJoerg Sonnenberger * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1748d201a5SJoerg Sonnenberger * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
1848d201a5SJoerg Sonnenberger * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
1948d201a5SJoerg Sonnenberger * SUCH DAMAGE.
2048d201a5SJoerg Sonnenberger *
215027f2b8SJohn Marino * patch - a program to apply diffs to original files
225027f2b8SJohn Marino *
2348d201a5SJoerg Sonnenberger * -C option added in 1998, original code by Marc Espie, based on FreeBSD
2448d201a5SJoerg Sonnenberger * behaviour
255027f2b8SJohn Marino *
26*b94b84caSDaniel Fojt * $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $
27*b94b84caSDaniel Fojt * $FreeBSD: head/usr.bin/patch/pch.c 354328 2019-11-04 03:07:01Z kevans $
2848d201a5SJoerg Sonnenberger */
2948d201a5SJoerg Sonnenberger
3048d201a5SJoerg Sonnenberger #include <sys/types.h>
3148d201a5SJoerg Sonnenberger #include <sys/stat.h>
3248d201a5SJoerg Sonnenberger
3348d201a5SJoerg Sonnenberger #include <ctype.h>
3448d201a5SJoerg Sonnenberger #include <libgen.h>
3548d201a5SJoerg Sonnenberger #include <limits.h>
36*b94b84caSDaniel Fojt #include <stdint.h>
3748d201a5SJoerg Sonnenberger #include <stdio.h>
3848d201a5SJoerg Sonnenberger #include <stdlib.h>
3948d201a5SJoerg Sonnenberger #include <string.h>
4048d201a5SJoerg Sonnenberger #include <unistd.h>
4148d201a5SJoerg Sonnenberger
4248d201a5SJoerg Sonnenberger #include "common.h"
4348d201a5SJoerg Sonnenberger #include "util.h"
4448d201a5SJoerg Sonnenberger #include "pch.h"
4548d201a5SJoerg Sonnenberger #include "pathnames.h"
4648d201a5SJoerg Sonnenberger
4748d201a5SJoerg Sonnenberger /* Patch (diff listing) abstract type. */
4848d201a5SJoerg Sonnenberger
49*b94b84caSDaniel Fojt static off_t p_filesize; /* size of the patch file */
5048d201a5SJoerg Sonnenberger static LINENUM p_first; /* 1st line number */
5148d201a5SJoerg Sonnenberger static LINENUM p_newfirst; /* 1st line number of replacement */
5248d201a5SJoerg Sonnenberger static LINENUM p_ptrn_lines; /* # lines in pattern */
5348d201a5SJoerg Sonnenberger static LINENUM p_repl_lines; /* # lines in replacement text */
5448d201a5SJoerg Sonnenberger static LINENUM p_end = -1; /* last line in hunk */
5548d201a5SJoerg Sonnenberger static LINENUM p_max; /* max allowed value of p_end */
5648d201a5SJoerg Sonnenberger static LINENUM p_context = 3; /* # of context lines */
5748d201a5SJoerg Sonnenberger static LINENUM p_input_line = 0; /* current line # from patch file */
5848d201a5SJoerg Sonnenberger static char **p_line = NULL;/* the text of the hunk */
59*b94b84caSDaniel Fojt static unsigned short *p_len = NULL; /* length of each line */
6048d201a5SJoerg Sonnenberger static char *p_char = NULL; /* +, -, and ! */
6148d201a5SJoerg Sonnenberger static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */
6248d201a5SJoerg Sonnenberger static int p_indent; /* indent to patch */
63*b94b84caSDaniel Fojt static off_t p_base; /* where to intuit this time */
6448d201a5SJoerg Sonnenberger static LINENUM p_bline; /* line # of p_base */
65*b94b84caSDaniel Fojt static off_t p_start; /* where intuit found a patch */
6648d201a5SJoerg Sonnenberger static LINENUM p_sline; /* and the line number for it */
6748d201a5SJoerg Sonnenberger static LINENUM p_hunk_beg; /* line number of current hunk */
6848d201a5SJoerg Sonnenberger static LINENUM p_efake = -1; /* end of faked up lines--don't free */
6948d201a5SJoerg Sonnenberger static LINENUM p_bfake = -1; /* beg of faked up lines */
7048d201a5SJoerg Sonnenberger static FILE *pfp = NULL; /* patch file pointer */
7148d201a5SJoerg Sonnenberger static char *bestguess = NULL; /* guess at correct filename */
7248d201a5SJoerg Sonnenberger
73*b94b84caSDaniel Fojt char *source_file;
74*b94b84caSDaniel Fojt
7548d201a5SJoerg Sonnenberger static void grow_hunkmax(void);
7648d201a5SJoerg Sonnenberger static int intuit_diff_type(void);
77*b94b84caSDaniel Fojt static void next_intuit_at(off_t, LINENUM);
78*b94b84caSDaniel Fojt static void skip_to(off_t, LINENUM);
795027f2b8SJohn Marino static size_t pgets(bool _do_indent);
8048d201a5SJoerg Sonnenberger static char *best_name(const struct file_name *, bool);
8148d201a5SJoerg Sonnenberger static char *posix_name(const struct file_name *, bool);
8248d201a5SJoerg Sonnenberger static size_t num_components(const char *);
83*b94b84caSDaniel Fojt static LINENUM strtolinenum(char *, char **);
8448d201a5SJoerg Sonnenberger
8548d201a5SJoerg Sonnenberger /*
8648d201a5SJoerg Sonnenberger * Prepare to look for the next patch in the patch file.
8748d201a5SJoerg Sonnenberger */
8848d201a5SJoerg Sonnenberger void
re_patch(void)8948d201a5SJoerg Sonnenberger re_patch(void)
9048d201a5SJoerg Sonnenberger {
9148d201a5SJoerg Sonnenberger p_first = 0;
9248d201a5SJoerg Sonnenberger p_newfirst = 0;
9348d201a5SJoerg Sonnenberger p_ptrn_lines = 0;
9448d201a5SJoerg Sonnenberger p_repl_lines = 0;
9548d201a5SJoerg Sonnenberger p_end = (LINENUM) - 1;
9648d201a5SJoerg Sonnenberger p_max = 0;
9748d201a5SJoerg Sonnenberger p_indent = 0;
9848d201a5SJoerg Sonnenberger }
9948d201a5SJoerg Sonnenberger
10048d201a5SJoerg Sonnenberger /*
10148d201a5SJoerg Sonnenberger * Open the patch file at the beginning of time.
10248d201a5SJoerg Sonnenberger */
10348d201a5SJoerg Sonnenberger void
open_patch_file(const char * filename)10448d201a5SJoerg Sonnenberger open_patch_file(const char *filename)
10548d201a5SJoerg Sonnenberger {
10648d201a5SJoerg Sonnenberger struct stat filestat;
1075027f2b8SJohn Marino int nr, nw;
10848d201a5SJoerg Sonnenberger
10948d201a5SJoerg Sonnenberger if (filename == NULL || *filename == '\0' || strEQ(filename, "-")) {
11048d201a5SJoerg Sonnenberger pfp = fopen(TMPPATNAME, "w");
11148d201a5SJoerg Sonnenberger if (pfp == NULL)
11248d201a5SJoerg Sonnenberger pfatal("can't create %s", TMPPATNAME);
1135027f2b8SJohn Marino while ((nr = fread(buf, 1, buf_size, stdin)) > 0) {
1145027f2b8SJohn Marino nw = fwrite(buf, 1, nr, pfp);
1155027f2b8SJohn Marino if (nr != nw)
1165027f2b8SJohn Marino pfatal("write error to %s", TMPPATNAME);
1175027f2b8SJohn Marino }
11832fe83a8SJoerg Sonnenberger if (ferror(pfp) || fclose(pfp))
11932fe83a8SJoerg Sonnenberger pfatal("can't write %s", TMPPATNAME);
12048d201a5SJoerg Sonnenberger filename = TMPPATNAME;
12148d201a5SJoerg Sonnenberger }
12248d201a5SJoerg Sonnenberger pfp = fopen(filename, "r");
12348d201a5SJoerg Sonnenberger if (pfp == NULL)
12448d201a5SJoerg Sonnenberger pfatal("patch file %s not found", filename);
125*b94b84caSDaniel Fojt if (fstat(fileno(pfp), &filestat))
126*b94b84caSDaniel Fojt pfatal("can't stat %s", filename);
12748d201a5SJoerg Sonnenberger p_filesize = filestat.st_size;
128*b94b84caSDaniel Fojt next_intuit_at(0, 1L); /* start at the beginning */
12948d201a5SJoerg Sonnenberger set_hunkmax();
13048d201a5SJoerg Sonnenberger }
13148d201a5SJoerg Sonnenberger
13248d201a5SJoerg Sonnenberger /*
13348d201a5SJoerg Sonnenberger * Make sure our dynamically realloced tables are malloced to begin with.
13448d201a5SJoerg Sonnenberger */
13548d201a5SJoerg Sonnenberger void
set_hunkmax(void)13648d201a5SJoerg Sonnenberger set_hunkmax(void)
13748d201a5SJoerg Sonnenberger {
13848d201a5SJoerg Sonnenberger if (p_line == NULL)
139*b94b84caSDaniel Fojt p_line = malloc(hunkmax * sizeof(char *));
14048d201a5SJoerg Sonnenberger if (p_len == NULL)
141*b94b84caSDaniel Fojt p_len = malloc(hunkmax * sizeof(unsigned short));
14248d201a5SJoerg Sonnenberger if (p_char == NULL)
143*b94b84caSDaniel Fojt p_char = malloc(hunkmax * sizeof(char));
14448d201a5SJoerg Sonnenberger }
14548d201a5SJoerg Sonnenberger
14648d201a5SJoerg Sonnenberger /*
14748d201a5SJoerg Sonnenberger * Enlarge the arrays containing the current hunk of patch.
14848d201a5SJoerg Sonnenberger */
14948d201a5SJoerg Sonnenberger static void
grow_hunkmax(void)15048d201a5SJoerg Sonnenberger grow_hunkmax(void)
15148d201a5SJoerg Sonnenberger {
152*b94b84caSDaniel Fojt int new_hunkmax = hunkmax * 2;
15348d201a5SJoerg Sonnenberger
15448d201a5SJoerg Sonnenberger if (p_line == NULL || p_len == NULL || p_char == NULL)
15548d201a5SJoerg Sonnenberger fatal("Internal memory allocation error\n");
15648d201a5SJoerg Sonnenberger
157*b94b84caSDaniel Fojt p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
158*b94b84caSDaniel Fojt p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short));
159*b94b84caSDaniel Fojt p_char = reallocf(p_char, new_hunkmax * sizeof(char));
16048d201a5SJoerg Sonnenberger
16148d201a5SJoerg Sonnenberger if (p_line != NULL && p_len != NULL && p_char != NULL) {
16248d201a5SJoerg Sonnenberger hunkmax = new_hunkmax;
16348d201a5SJoerg Sonnenberger return;
16448d201a5SJoerg Sonnenberger }
16548d201a5SJoerg Sonnenberger
16648d201a5SJoerg Sonnenberger if (!using_plan_a)
16748d201a5SJoerg Sonnenberger fatal("out of memory\n");
16848d201a5SJoerg Sonnenberger out_of_mem = true; /* whatever is null will be allocated again */
16948d201a5SJoerg Sonnenberger /* from within plan_a(), of all places */
17048d201a5SJoerg Sonnenberger }
17148d201a5SJoerg Sonnenberger
17248d201a5SJoerg Sonnenberger /* True if the remainder of the patch file contains a diff of some sort. */
17348d201a5SJoerg Sonnenberger
17448d201a5SJoerg Sonnenberger bool
there_is_another_patch(void)17548d201a5SJoerg Sonnenberger there_is_another_patch(void)
17648d201a5SJoerg Sonnenberger {
17748d201a5SJoerg Sonnenberger bool exists = false;
17848d201a5SJoerg Sonnenberger
179*b94b84caSDaniel Fojt if (p_base != 0 && p_base >= p_filesize) {
18048d201a5SJoerg Sonnenberger if (verbose)
18148d201a5SJoerg Sonnenberger say("done\n");
18248d201a5SJoerg Sonnenberger return false;
18348d201a5SJoerg Sonnenberger }
184*b94b84caSDaniel Fojt if (p_filesize == 0)
185*b94b84caSDaniel Fojt return false;
186*b94b84caSDaniel Fojt nonempty_patchf_seen = true;
18748d201a5SJoerg Sonnenberger if (verbose)
18848d201a5SJoerg Sonnenberger say("Hmm...");
18948d201a5SJoerg Sonnenberger diff_type = intuit_diff_type();
19048d201a5SJoerg Sonnenberger if (!diff_type) {
191*b94b84caSDaniel Fojt if (p_base != 0) {
19248d201a5SJoerg Sonnenberger if (verbose)
19348d201a5SJoerg Sonnenberger say(" Ignoring the trailing garbage.\ndone\n");
19448d201a5SJoerg Sonnenberger } else
19548d201a5SJoerg Sonnenberger say(" I can't seem to find a patch in there anywhere.\n");
19648d201a5SJoerg Sonnenberger return false;
19748d201a5SJoerg Sonnenberger }
19848d201a5SJoerg Sonnenberger if (verbose)
19948d201a5SJoerg Sonnenberger say(" %sooks like %s to me...\n",
200*b94b84caSDaniel Fojt (p_base == 0 ? "L" : "The next patch l"),
20148d201a5SJoerg Sonnenberger diff_type == UNI_DIFF ? "a unified diff" :
20248d201a5SJoerg Sonnenberger diff_type == CONTEXT_DIFF ? "a context diff" :
20348d201a5SJoerg Sonnenberger diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" :
20448d201a5SJoerg Sonnenberger diff_type == NORMAL_DIFF ? "a normal diff" :
20548d201a5SJoerg Sonnenberger "an ed script");
20648d201a5SJoerg Sonnenberger if (p_indent && verbose)
20748d201a5SJoerg Sonnenberger say("(Patch is indented %d space%s.)\n", p_indent,
20848d201a5SJoerg Sonnenberger p_indent == 1 ? "" : "s");
20948d201a5SJoerg Sonnenberger skip_to(p_start, p_sline);
21048d201a5SJoerg Sonnenberger while (filearg[0] == NULL) {
21148d201a5SJoerg Sonnenberger if (force || batch) {
21248d201a5SJoerg Sonnenberger say("No file to patch. Skipping...\n");
213*b94b84caSDaniel Fojt filearg[0] = xstrdup(bestguess);
21448d201a5SJoerg Sonnenberger skip_rest_of_patch = true;
21548d201a5SJoerg Sonnenberger return true;
21648d201a5SJoerg Sonnenberger }
21748d201a5SJoerg Sonnenberger ask("File to patch: ");
21848d201a5SJoerg Sonnenberger if (*buf != '\n') {
21948d201a5SJoerg Sonnenberger free(bestguess);
220*b94b84caSDaniel Fojt bestguess = xstrdup(buf);
22148d201a5SJoerg Sonnenberger filearg[0] = fetchname(buf, &exists, 0);
22248d201a5SJoerg Sonnenberger }
223*b94b84caSDaniel Fojt /*
224*b94b84caSDaniel Fojt * fetchname can now return buf = NULL, exists = true, to
225*b94b84caSDaniel Fojt * indicate to the caller that /dev/null was specified. Retain
226*b94b84caSDaniel Fojt * previous behavior for now until this can be better evaluted.
227*b94b84caSDaniel Fojt */
228*b94b84caSDaniel Fojt if (filearg[0] == NULL || !exists) {
229*b94b84caSDaniel Fojt int def_skip = *bestguess == '\0';
230*b94b84caSDaniel Fojt ask("No file found--skip this patch? [%c] ",
231*b94b84caSDaniel Fojt def_skip ? 'y' : 'n');
232*b94b84caSDaniel Fojt if (*buf == 'n' || (!def_skip && *buf != 'y'))
23348d201a5SJoerg Sonnenberger continue;
23448d201a5SJoerg Sonnenberger if (verbose)
23548d201a5SJoerg Sonnenberger say("Skipping patch...\n");
23648d201a5SJoerg Sonnenberger free(filearg[0]);
23748d201a5SJoerg Sonnenberger filearg[0] = fetchname(bestguess, &exists, 0);
23848d201a5SJoerg Sonnenberger skip_rest_of_patch = true;
23948d201a5SJoerg Sonnenberger return true;
24048d201a5SJoerg Sonnenberger }
24148d201a5SJoerg Sonnenberger }
24248d201a5SJoerg Sonnenberger return true;
24348d201a5SJoerg Sonnenberger }
24448d201a5SJoerg Sonnenberger
2455027f2b8SJohn Marino static void
p4_fetchname(struct file_name * name,char * str)2465027f2b8SJohn Marino p4_fetchname(struct file_name *name, char *str)
2475027f2b8SJohn Marino {
2485027f2b8SJohn Marino char *t, *h;
2495027f2b8SJohn Marino
2505027f2b8SJohn Marino /* Skip leading whitespace. */
2515027f2b8SJohn Marino while (isspace((unsigned char)*str))
2525027f2b8SJohn Marino str++;
2535027f2b8SJohn Marino
2545027f2b8SJohn Marino /* Remove the file revision number. */
2555027f2b8SJohn Marino for (t = str, h = NULL; *t != '\0' && !isspace((unsigned char)*t); t++)
2565027f2b8SJohn Marino if (*t == '#')
2575027f2b8SJohn Marino h = t;
2585027f2b8SJohn Marino if (h != NULL)
2595027f2b8SJohn Marino *h = '\0';
2605027f2b8SJohn Marino
2615027f2b8SJohn Marino name->path = fetchname(str, &name->exists, strippath);
2625027f2b8SJohn Marino }
2635027f2b8SJohn Marino
26448d201a5SJoerg Sonnenberger /* Determine what kind of diff is in the remaining part of the patch file. */
26548d201a5SJoerg Sonnenberger
26648d201a5SJoerg Sonnenberger static int
intuit_diff_type(void)26748d201a5SJoerg Sonnenberger intuit_diff_type(void)
26848d201a5SJoerg Sonnenberger {
269*b94b84caSDaniel Fojt off_t this_line = 0, previous_line;
270*b94b84caSDaniel Fojt off_t first_command_line = -1;
27148d201a5SJoerg Sonnenberger LINENUM fcl_line = -1;
27248d201a5SJoerg Sonnenberger bool last_line_was_command = false, this_is_a_command = false;
27348d201a5SJoerg Sonnenberger bool stars_last_line = false, stars_this_line = false;
27448d201a5SJoerg Sonnenberger char *s, *t;
27548d201a5SJoerg Sonnenberger int indent, retval;
27648d201a5SJoerg Sonnenberger struct file_name names[MAX_FILE];
277*b94b84caSDaniel Fojt int piece_of_git = 0;
27848d201a5SJoerg Sonnenberger
27948d201a5SJoerg Sonnenberger memset(names, 0, sizeof(names));
28048d201a5SJoerg Sonnenberger ok_to_create_file = false;
281*b94b84caSDaniel Fojt fseeko(pfp, p_base, SEEK_SET);
28248d201a5SJoerg Sonnenberger p_input_line = p_bline - 1;
28348d201a5SJoerg Sonnenberger for (;;) {
28448d201a5SJoerg Sonnenberger previous_line = this_line;
28548d201a5SJoerg Sonnenberger last_line_was_command = this_is_a_command;
28648d201a5SJoerg Sonnenberger stars_last_line = stars_this_line;
287*b94b84caSDaniel Fojt this_line = ftello(pfp);
28848d201a5SJoerg Sonnenberger indent = 0;
28948d201a5SJoerg Sonnenberger p_input_line++;
2905027f2b8SJohn Marino if (pgets(false) == 0) {
291*b94b84caSDaniel Fojt if (first_command_line >= 0) {
29248d201a5SJoerg Sonnenberger /* nothing but deletes!? */
29348d201a5SJoerg Sonnenberger p_start = first_command_line;
29448d201a5SJoerg Sonnenberger p_sline = fcl_line;
29548d201a5SJoerg Sonnenberger retval = ED_DIFF;
29648d201a5SJoerg Sonnenberger goto scan_exit;
29748d201a5SJoerg Sonnenberger } else {
29848d201a5SJoerg Sonnenberger p_start = this_line;
29948d201a5SJoerg Sonnenberger p_sline = p_input_line;
30048d201a5SJoerg Sonnenberger retval = 0;
30148d201a5SJoerg Sonnenberger goto scan_exit;
30248d201a5SJoerg Sonnenberger }
30348d201a5SJoerg Sonnenberger }
30448d201a5SJoerg Sonnenberger for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) {
30548d201a5SJoerg Sonnenberger if (*s == '\t')
30648d201a5SJoerg Sonnenberger indent += 8 - (indent % 8);
30748d201a5SJoerg Sonnenberger else
30848d201a5SJoerg Sonnenberger indent++;
30948d201a5SJoerg Sonnenberger }
31041871674SJoerg Sonnenberger for (t = s; isdigit((unsigned char)*t) || *t == ','; t++)
31148d201a5SJoerg Sonnenberger ;
31241871674SJoerg Sonnenberger this_is_a_command = (isdigit((unsigned char)*s) &&
31348d201a5SJoerg Sonnenberger (*t == 'd' || *t == 'c' || *t == 'a'));
314*b94b84caSDaniel Fojt if (first_command_line < 0 && this_is_a_command) {
31548d201a5SJoerg Sonnenberger first_command_line = this_line;
31648d201a5SJoerg Sonnenberger fcl_line = p_input_line;
31748d201a5SJoerg Sonnenberger p_indent = indent; /* assume this for now */
31848d201a5SJoerg Sonnenberger }
31948d201a5SJoerg Sonnenberger if (!stars_last_line && strnEQ(s, "*** ", 4))
32048d201a5SJoerg Sonnenberger names[OLD_FILE].path = fetchname(s + 4,
32148d201a5SJoerg Sonnenberger &names[OLD_FILE].exists, strippath);
322*b94b84caSDaniel Fojt else if (strnEQ(s, "--- ", 4)) {
323*b94b84caSDaniel Fojt size_t off = 4;
324*b94b84caSDaniel Fojt if (piece_of_git && strippath == 957 &&
325*b94b84caSDaniel Fojt strnEQ(s, "--- a/", 6))
326*b94b84caSDaniel Fojt off = 6;
327*b94b84caSDaniel Fojt names[NEW_FILE].path = fetchname(s + off,
32848d201a5SJoerg Sonnenberger &names[NEW_FILE].exists, strippath);
329*b94b84caSDaniel Fojt } else if (strnEQ(s, "+++ ", 4)) {
33048d201a5SJoerg Sonnenberger /* pretend it is the old name */
331*b94b84caSDaniel Fojt size_t off = 4;
332*b94b84caSDaniel Fojt if (piece_of_git && strippath == 957 &&
333*b94b84caSDaniel Fojt strnEQ(s, "+++ b/", 6))
334*b94b84caSDaniel Fojt off = 6;
335*b94b84caSDaniel Fojt names[OLD_FILE].path = fetchname(s + off,
33648d201a5SJoerg Sonnenberger &names[OLD_FILE].exists, strippath);
337*b94b84caSDaniel Fojt } else if (strnEQ(s, "Index:", 6))
33848d201a5SJoerg Sonnenberger names[INDEX_FILE].path = fetchname(s + 6,
33948d201a5SJoerg Sonnenberger &names[INDEX_FILE].exists, strippath);
34048d201a5SJoerg Sonnenberger else if (strnEQ(s, "Prereq:", 7)) {
34141871674SJoerg Sonnenberger for (t = s + 7; isspace((unsigned char)*t); t++)
34248d201a5SJoerg Sonnenberger ;
343*b94b84caSDaniel Fojt revision = xstrdup(t);
344*b94b84caSDaniel Fojt for (t = revision;
345*b94b84caSDaniel Fojt *t && !isspace((unsigned char)*t); t++)
34648d201a5SJoerg Sonnenberger ;
34748d201a5SJoerg Sonnenberger *t = '\0';
34848d201a5SJoerg Sonnenberger if (*revision == '\0') {
34948d201a5SJoerg Sonnenberger free(revision);
35048d201a5SJoerg Sonnenberger revision = NULL;
35148d201a5SJoerg Sonnenberger }
352*b94b84caSDaniel Fojt } else if (strnEQ(s, "diff --git a/", 13)) {
353*b94b84caSDaniel Fojt /* Git-style diffs. */
354*b94b84caSDaniel Fojt piece_of_git = 1;
3555027f2b8SJohn Marino } else if (strnEQ(s, "==== ", 5)) {
3565027f2b8SJohn Marino /* Perforce-style diffs. */
3575027f2b8SJohn Marino if ((t = strstr(s + 5, " - ")) != NULL)
3585027f2b8SJohn Marino p4_fetchname(&names[NEW_FILE], t + 3);
3595027f2b8SJohn Marino p4_fetchname(&names[OLD_FILE], s + 5);
36048d201a5SJoerg Sonnenberger }
36148d201a5SJoerg Sonnenberger if ((!diff_type || diff_type == ED_DIFF) &&
362*b94b84caSDaniel Fojt first_command_line >= 0 &&
36348d201a5SJoerg Sonnenberger strEQ(s, ".\n")) {
36448d201a5SJoerg Sonnenberger p_indent = indent;
36548d201a5SJoerg Sonnenberger p_start = first_command_line;
36648d201a5SJoerg Sonnenberger p_sline = fcl_line;
36748d201a5SJoerg Sonnenberger retval = ED_DIFF;
36848d201a5SJoerg Sonnenberger goto scan_exit;
36948d201a5SJoerg Sonnenberger }
37048d201a5SJoerg Sonnenberger if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) {
37148d201a5SJoerg Sonnenberger if (strnEQ(s + 4, "0,0", 3))
37248d201a5SJoerg Sonnenberger ok_to_create_file = true;
37348d201a5SJoerg Sonnenberger p_indent = indent;
37448d201a5SJoerg Sonnenberger p_start = this_line;
37548d201a5SJoerg Sonnenberger p_sline = p_input_line;
37648d201a5SJoerg Sonnenberger retval = UNI_DIFF;
37748d201a5SJoerg Sonnenberger goto scan_exit;
37848d201a5SJoerg Sonnenberger }
37948d201a5SJoerg Sonnenberger stars_this_line = strnEQ(s, "********", 8);
38048d201a5SJoerg Sonnenberger if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line &&
38148d201a5SJoerg Sonnenberger strnEQ(s, "*** ", 4)) {
382*b94b84caSDaniel Fojt if (strtolinenum(s + 4, &s) == 0)
38348d201a5SJoerg Sonnenberger ok_to_create_file = true;
38448d201a5SJoerg Sonnenberger /*
38548d201a5SJoerg Sonnenberger * If this is a new context diff the character just
386*b94b84caSDaniel Fojt * at the end of the line is a '*'.
38748d201a5SJoerg Sonnenberger */
388*b94b84caSDaniel Fojt while (*s && *s != '\n')
38948d201a5SJoerg Sonnenberger s++;
39048d201a5SJoerg Sonnenberger p_indent = indent;
39148d201a5SJoerg Sonnenberger p_start = previous_line;
39248d201a5SJoerg Sonnenberger p_sline = p_input_line - 1;
39348d201a5SJoerg Sonnenberger retval = (*(s - 1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF);
39448d201a5SJoerg Sonnenberger goto scan_exit;
39548d201a5SJoerg Sonnenberger }
39648d201a5SJoerg Sonnenberger if ((!diff_type || diff_type == NORMAL_DIFF) &&
39748d201a5SJoerg Sonnenberger last_line_was_command &&
39848d201a5SJoerg Sonnenberger (strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2))) {
39948d201a5SJoerg Sonnenberger p_start = previous_line;
40048d201a5SJoerg Sonnenberger p_sline = p_input_line - 1;
40148d201a5SJoerg Sonnenberger p_indent = indent;
40248d201a5SJoerg Sonnenberger retval = NORMAL_DIFF;
40348d201a5SJoerg Sonnenberger goto scan_exit;
40448d201a5SJoerg Sonnenberger }
40548d201a5SJoerg Sonnenberger }
40648d201a5SJoerg Sonnenberger scan_exit:
40748d201a5SJoerg Sonnenberger if (retval == UNI_DIFF) {
40848d201a5SJoerg Sonnenberger /* unswap old and new */
40948d201a5SJoerg Sonnenberger struct file_name tmp = names[OLD_FILE];
41048d201a5SJoerg Sonnenberger names[OLD_FILE] = names[NEW_FILE];
41148d201a5SJoerg Sonnenberger names[NEW_FILE] = tmp;
41248d201a5SJoerg Sonnenberger }
413*b94b84caSDaniel Fojt
414*b94b84caSDaniel Fojt /* Invalidated */
415*b94b84caSDaniel Fojt free(source_file);
416*b94b84caSDaniel Fojt source_file = NULL;
417*b94b84caSDaniel Fojt
418*b94b84caSDaniel Fojt if (retval != 0) {
419*b94b84caSDaniel Fojt /*
420*b94b84caSDaniel Fojt * If we've successfully determined a diff type, stored in
421*b94b84caSDaniel Fojt * retval, path == NULL means _PATH_DEVNULL if exists is set.
422*b94b84caSDaniel Fojt * Explicitly specify it here to make it easier to detect later
423*b94b84caSDaniel Fojt * on that we're actually creating a file and not that we've
424*b94b84caSDaniel Fojt * just goofed something up.
425*b94b84caSDaniel Fojt */
426*b94b84caSDaniel Fojt if (names[OLD_FILE].path != NULL)
427*b94b84caSDaniel Fojt source_file = xstrdup(names[OLD_FILE].path);
428*b94b84caSDaniel Fojt else if (names[OLD_FILE].exists)
429*b94b84caSDaniel Fojt source_file = xstrdup(_PATH_DEVNULL);
430*b94b84caSDaniel Fojt }
43148d201a5SJoerg Sonnenberger if (filearg[0] == NULL) {
43248d201a5SJoerg Sonnenberger if (posix)
43348d201a5SJoerg Sonnenberger filearg[0] = posix_name(names, ok_to_create_file);
43448d201a5SJoerg Sonnenberger else {
43548d201a5SJoerg Sonnenberger /* Ignore the Index: name for context diffs, like GNU */
43648d201a5SJoerg Sonnenberger if (names[OLD_FILE].path != NULL ||
43748d201a5SJoerg Sonnenberger names[NEW_FILE].path != NULL) {
43848d201a5SJoerg Sonnenberger free(names[INDEX_FILE].path);
43948d201a5SJoerg Sonnenberger names[INDEX_FILE].path = NULL;
44048d201a5SJoerg Sonnenberger }
44148d201a5SJoerg Sonnenberger filearg[0] = best_name(names, ok_to_create_file);
44248d201a5SJoerg Sonnenberger }
44348d201a5SJoerg Sonnenberger }
44448d201a5SJoerg Sonnenberger
44548d201a5SJoerg Sonnenberger free(bestguess);
44648d201a5SJoerg Sonnenberger bestguess = NULL;
44748d201a5SJoerg Sonnenberger if (filearg[0] != NULL)
448*b94b84caSDaniel Fojt bestguess = xstrdup(filearg[0]);
44948d201a5SJoerg Sonnenberger else if (!ok_to_create_file) {
45048d201a5SJoerg Sonnenberger /*
45148d201a5SJoerg Sonnenberger * We don't want to create a new file but we need a
45248d201a5SJoerg Sonnenberger * filename to set bestguess. Avoid setting filearg[0]
45348d201a5SJoerg Sonnenberger * so the file is not created automatically.
45448d201a5SJoerg Sonnenberger */
45548d201a5SJoerg Sonnenberger if (posix)
45648d201a5SJoerg Sonnenberger bestguess = posix_name(names, true);
45748d201a5SJoerg Sonnenberger else
45848d201a5SJoerg Sonnenberger bestguess = best_name(names, true);
45948d201a5SJoerg Sonnenberger }
46048d201a5SJoerg Sonnenberger free(names[OLD_FILE].path);
46148d201a5SJoerg Sonnenberger free(names[NEW_FILE].path);
46248d201a5SJoerg Sonnenberger free(names[INDEX_FILE].path);
46348d201a5SJoerg Sonnenberger return retval;
46448d201a5SJoerg Sonnenberger }
46548d201a5SJoerg Sonnenberger
46648d201a5SJoerg Sonnenberger /*
46748d201a5SJoerg Sonnenberger * Remember where this patch ends so we know where to start up again.
46848d201a5SJoerg Sonnenberger */
46948d201a5SJoerg Sonnenberger static void
next_intuit_at(off_t file_pos,LINENUM file_line)470*b94b84caSDaniel Fojt next_intuit_at(off_t file_pos, LINENUM file_line)
47148d201a5SJoerg Sonnenberger {
47248d201a5SJoerg Sonnenberger p_base = file_pos;
47348d201a5SJoerg Sonnenberger p_bline = file_line;
47448d201a5SJoerg Sonnenberger }
47548d201a5SJoerg Sonnenberger
47648d201a5SJoerg Sonnenberger /*
477*b94b84caSDaniel Fojt * Basically a verbose fseeko() to the actual diff listing.
47848d201a5SJoerg Sonnenberger */
47948d201a5SJoerg Sonnenberger static void
skip_to(off_t file_pos,LINENUM file_line)480*b94b84caSDaniel Fojt skip_to(off_t file_pos, LINENUM file_line)
48148d201a5SJoerg Sonnenberger {
4825027f2b8SJohn Marino size_t len;
48348d201a5SJoerg Sonnenberger
48448d201a5SJoerg Sonnenberger if (p_base > file_pos)
485*b94b84caSDaniel Fojt fatal("Internal error: seek %lld>%lld\n",
486*b94b84caSDaniel Fojt (long long)p_base, (long long)file_pos);
48748d201a5SJoerg Sonnenberger if (verbose && p_base < file_pos) {
488*b94b84caSDaniel Fojt fseeko(pfp, p_base, SEEK_SET);
48948d201a5SJoerg Sonnenberger say("The text leading up to this was:\n--------------------------\n");
490*b94b84caSDaniel Fojt while (ftello(pfp) < file_pos) {
4915027f2b8SJohn Marino len = pgets(false);
4925027f2b8SJohn Marino if (len == 0)
49348d201a5SJoerg Sonnenberger fatal("Unexpected end of file\n");
49448d201a5SJoerg Sonnenberger say("|%s", buf);
49548d201a5SJoerg Sonnenberger }
49648d201a5SJoerg Sonnenberger say("--------------------------\n");
49748d201a5SJoerg Sonnenberger } else
498*b94b84caSDaniel Fojt fseeko(pfp, file_pos, SEEK_SET);
49948d201a5SJoerg Sonnenberger p_input_line = file_line - 1;
50048d201a5SJoerg Sonnenberger }
50148d201a5SJoerg Sonnenberger
50248d201a5SJoerg Sonnenberger /* Make this a function for better debugging. */
50348d201a5SJoerg Sonnenberger static void
malformed(void)50448d201a5SJoerg Sonnenberger malformed(void)
50548d201a5SJoerg Sonnenberger {
50648d201a5SJoerg Sonnenberger fatal("malformed patch at line %ld: %s", p_input_line, buf);
50748d201a5SJoerg Sonnenberger /* about as informative as "Syntax error" in C */
50848d201a5SJoerg Sonnenberger }
50948d201a5SJoerg Sonnenberger
51048d201a5SJoerg Sonnenberger /*
51148d201a5SJoerg Sonnenberger * True if the line has been discarded (i.e. it is a line saying
51248d201a5SJoerg Sonnenberger * "\ No newline at end of file".)
51348d201a5SJoerg Sonnenberger */
51448d201a5SJoerg Sonnenberger static bool
remove_special_line(void)51548d201a5SJoerg Sonnenberger remove_special_line(void)
51648d201a5SJoerg Sonnenberger {
51748d201a5SJoerg Sonnenberger int c;
51848d201a5SJoerg Sonnenberger
51948d201a5SJoerg Sonnenberger c = fgetc(pfp);
52048d201a5SJoerg Sonnenberger if (c == '\\') {
52148d201a5SJoerg Sonnenberger do {
52248d201a5SJoerg Sonnenberger c = fgetc(pfp);
52348d201a5SJoerg Sonnenberger } while (c != EOF && c != '\n');
52448d201a5SJoerg Sonnenberger
52548d201a5SJoerg Sonnenberger return true;
52648d201a5SJoerg Sonnenberger }
52748d201a5SJoerg Sonnenberger if (c != EOF)
528*b94b84caSDaniel Fojt fseeko(pfp, -1, SEEK_CUR);
52948d201a5SJoerg Sonnenberger
53048d201a5SJoerg Sonnenberger return false;
53148d201a5SJoerg Sonnenberger }
53248d201a5SJoerg Sonnenberger
53348d201a5SJoerg Sonnenberger /*
53448d201a5SJoerg Sonnenberger * True if there is more of the current diff listing to process.
53548d201a5SJoerg Sonnenberger */
53648d201a5SJoerg Sonnenberger bool
another_hunk(void)53748d201a5SJoerg Sonnenberger another_hunk(void)
53848d201a5SJoerg Sonnenberger {
539*b94b84caSDaniel Fojt off_t line_beginning; /* file pos of the current line */
54048d201a5SJoerg Sonnenberger LINENUM repl_beginning; /* index of --- line */
54148d201a5SJoerg Sonnenberger LINENUM fillcnt; /* #lines of missing ptrn or repl */
54248d201a5SJoerg Sonnenberger LINENUM fillsrc; /* index of first line to copy */
54348d201a5SJoerg Sonnenberger LINENUM filldst; /* index of first missing line */
544*b94b84caSDaniel Fojt bool ptrn_spaces_eaten; /* ptrn was slightly malformed */
54548d201a5SJoerg Sonnenberger bool repl_could_be_missing; /* no + or ! lines in this hunk */
54648d201a5SJoerg Sonnenberger bool repl_missing; /* we are now backtracking */
547*b94b84caSDaniel Fojt off_t repl_backtrack_position; /* file pos of first repl line */
54848d201a5SJoerg Sonnenberger LINENUM repl_patch_line; /* input line number for same */
54948d201a5SJoerg Sonnenberger LINENUM ptrn_copiable; /* # of copiable lines in ptrn */
5505027f2b8SJohn Marino char *s;
5515027f2b8SJohn Marino size_t len;
55248d201a5SJoerg Sonnenberger int context = 0;
55348d201a5SJoerg Sonnenberger
55448d201a5SJoerg Sonnenberger while (p_end >= 0) {
55548d201a5SJoerg Sonnenberger if (p_end == p_efake)
55648d201a5SJoerg Sonnenberger p_end = p_bfake; /* don't free twice */
55748d201a5SJoerg Sonnenberger else
55848d201a5SJoerg Sonnenberger free(p_line[p_end]);
55948d201a5SJoerg Sonnenberger p_end--;
56048d201a5SJoerg Sonnenberger }
56148d201a5SJoerg Sonnenberger p_efake = -1;
56248d201a5SJoerg Sonnenberger
56348d201a5SJoerg Sonnenberger p_max = hunkmax; /* gets reduced when --- found */
56448d201a5SJoerg Sonnenberger if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) {
565*b94b84caSDaniel Fojt line_beginning = ftello(pfp);
56648d201a5SJoerg Sonnenberger repl_beginning = 0;
56748d201a5SJoerg Sonnenberger fillcnt = 0;
56848d201a5SJoerg Sonnenberger fillsrc = 0;
56948d201a5SJoerg Sonnenberger filldst = 0;
57048d201a5SJoerg Sonnenberger ptrn_spaces_eaten = false;
57148d201a5SJoerg Sonnenberger repl_could_be_missing = true;
57248d201a5SJoerg Sonnenberger repl_missing = false;
57348d201a5SJoerg Sonnenberger repl_backtrack_position = 0;
57448d201a5SJoerg Sonnenberger repl_patch_line = 0;
57548d201a5SJoerg Sonnenberger ptrn_copiable = 0;
57648d201a5SJoerg Sonnenberger
5775027f2b8SJohn Marino len = pgets(true);
57848d201a5SJoerg Sonnenberger p_input_line++;
5795027f2b8SJohn Marino if (len == 0 || strnNE(buf, "********", 8)) {
58048d201a5SJoerg Sonnenberger next_intuit_at(line_beginning, p_input_line);
58148d201a5SJoerg Sonnenberger return false;
58248d201a5SJoerg Sonnenberger }
58348d201a5SJoerg Sonnenberger p_context = 100;
58448d201a5SJoerg Sonnenberger p_hunk_beg = p_input_line + 1;
58548d201a5SJoerg Sonnenberger while (p_end < p_max) {
586*b94b84caSDaniel Fojt line_beginning = ftello(pfp);
5875027f2b8SJohn Marino len = pgets(true);
58848d201a5SJoerg Sonnenberger p_input_line++;
5895027f2b8SJohn Marino if (len == 0) {
59048d201a5SJoerg Sonnenberger if (p_max - p_end < 4) {
59148d201a5SJoerg Sonnenberger /* assume blank lines got chopped */
5925027f2b8SJohn Marino strlcpy(buf, " \n", buf_size);
59348d201a5SJoerg Sonnenberger } else {
59448d201a5SJoerg Sonnenberger if (repl_beginning && repl_could_be_missing) {
59548d201a5SJoerg Sonnenberger repl_missing = true;
59648d201a5SJoerg Sonnenberger goto hunk_done;
59748d201a5SJoerg Sonnenberger }
59848d201a5SJoerg Sonnenberger fatal("unexpected end of file in patch\n");
59948d201a5SJoerg Sonnenberger }
60048d201a5SJoerg Sonnenberger }
60148d201a5SJoerg Sonnenberger p_end++;
60248d201a5SJoerg Sonnenberger if (p_end >= hunkmax)
60348d201a5SJoerg Sonnenberger fatal("Internal error: hunk larger than hunk "
60448d201a5SJoerg Sonnenberger "buffer size");
60548d201a5SJoerg Sonnenberger p_char[p_end] = *buf;
60648d201a5SJoerg Sonnenberger p_line[p_end] = NULL;
60748d201a5SJoerg Sonnenberger switch (*buf) {
60848d201a5SJoerg Sonnenberger case '*':
60948d201a5SJoerg Sonnenberger if (strnEQ(buf, "********", 8)) {
61048d201a5SJoerg Sonnenberger if (repl_beginning && repl_could_be_missing) {
61148d201a5SJoerg Sonnenberger repl_missing = true;
61248d201a5SJoerg Sonnenberger goto hunk_done;
61348d201a5SJoerg Sonnenberger } else
61448d201a5SJoerg Sonnenberger fatal("unexpected end of hunk "
61548d201a5SJoerg Sonnenberger "at line %ld\n",
61648d201a5SJoerg Sonnenberger p_input_line);
61748d201a5SJoerg Sonnenberger }
61848d201a5SJoerg Sonnenberger if (p_end != 0) {
61948d201a5SJoerg Sonnenberger if (repl_beginning && repl_could_be_missing) {
62048d201a5SJoerg Sonnenberger repl_missing = true;
62148d201a5SJoerg Sonnenberger goto hunk_done;
62248d201a5SJoerg Sonnenberger }
62348d201a5SJoerg Sonnenberger fatal("unexpected *** at line %ld: %s",
62448d201a5SJoerg Sonnenberger p_input_line, buf);
62548d201a5SJoerg Sonnenberger }
62648d201a5SJoerg Sonnenberger context = 0;
62748d201a5SJoerg Sonnenberger p_line[p_end] = savestr(buf);
62848d201a5SJoerg Sonnenberger if (out_of_mem) {
62948d201a5SJoerg Sonnenberger p_end--;
63048d201a5SJoerg Sonnenberger return false;
63148d201a5SJoerg Sonnenberger }
632*b94b84caSDaniel Fojt for (s = buf;
633*b94b84caSDaniel Fojt *s && !isdigit((unsigned char)*s); s++)
63448d201a5SJoerg Sonnenberger ;
63548d201a5SJoerg Sonnenberger if (!*s)
63648d201a5SJoerg Sonnenberger malformed();
63748d201a5SJoerg Sonnenberger if (strnEQ(s, "0,0", 3))
63848d201a5SJoerg Sonnenberger memmove(s, s + 2, strlen(s + 2) + 1);
639*b94b84caSDaniel Fojt p_first = strtolinenum(s, &s);
64048d201a5SJoerg Sonnenberger if (*s == ',') {
641*b94b84caSDaniel Fojt for (;
642*b94b84caSDaniel Fojt *s && !isdigit((unsigned char)*s); s++)
64348d201a5SJoerg Sonnenberger ;
64448d201a5SJoerg Sonnenberger if (!*s)
64548d201a5SJoerg Sonnenberger malformed();
646*b94b84caSDaniel Fojt p_ptrn_lines = strtolinenum(s, &s) - p_first + 1;
647*b94b84caSDaniel Fojt if (p_ptrn_lines < 0)
648*b94b84caSDaniel Fojt malformed();
64948d201a5SJoerg Sonnenberger } else if (p_first)
65048d201a5SJoerg Sonnenberger p_ptrn_lines = 1;
65148d201a5SJoerg Sonnenberger else {
65248d201a5SJoerg Sonnenberger p_ptrn_lines = 0;
65348d201a5SJoerg Sonnenberger p_first = 1;
65448d201a5SJoerg Sonnenberger }
655*b94b84caSDaniel Fojt if (p_first >= LINENUM_MAX - p_ptrn_lines ||
656*b94b84caSDaniel Fojt p_ptrn_lines >= LINENUM_MAX - 6)
657*b94b84caSDaniel Fojt malformed();
65848d201a5SJoerg Sonnenberger
65948d201a5SJoerg Sonnenberger /* we need this much at least */
66048d201a5SJoerg Sonnenberger p_max = p_ptrn_lines + 6;
66148d201a5SJoerg Sonnenberger while (p_max >= hunkmax)
66248d201a5SJoerg Sonnenberger grow_hunkmax();
66348d201a5SJoerg Sonnenberger p_max = hunkmax;
66448d201a5SJoerg Sonnenberger break;
66548d201a5SJoerg Sonnenberger case '-':
66648d201a5SJoerg Sonnenberger if (buf[1] == '-') {
66748d201a5SJoerg Sonnenberger if (repl_beginning ||
66848d201a5SJoerg Sonnenberger (p_end != p_ptrn_lines + 1 +
66948d201a5SJoerg Sonnenberger (p_char[p_end - 1] == '\n'))) {
67048d201a5SJoerg Sonnenberger if (p_end == 1) {
67148d201a5SJoerg Sonnenberger /*
67248d201a5SJoerg Sonnenberger * `old' lines were omitted;
67348d201a5SJoerg Sonnenberger * set up to fill them in
67448d201a5SJoerg Sonnenberger * from 'new' context lines.
67548d201a5SJoerg Sonnenberger */
67648d201a5SJoerg Sonnenberger p_end = p_ptrn_lines + 1;
67748d201a5SJoerg Sonnenberger fillsrc = p_end + 1;
67848d201a5SJoerg Sonnenberger filldst = 1;
67948d201a5SJoerg Sonnenberger fillcnt = p_ptrn_lines;
68048d201a5SJoerg Sonnenberger } else {
68148d201a5SJoerg Sonnenberger if (repl_beginning) {
68248d201a5SJoerg Sonnenberger if (repl_could_be_missing) {
68348d201a5SJoerg Sonnenberger repl_missing = true;
68448d201a5SJoerg Sonnenberger goto hunk_done;
68548d201a5SJoerg Sonnenberger }
68648d201a5SJoerg Sonnenberger fatal("duplicate \"---\" at line %ld--check line numbers at line %ld\n",
68748d201a5SJoerg Sonnenberger p_input_line, p_hunk_beg + repl_beginning);
68848d201a5SJoerg Sonnenberger } else {
68948d201a5SJoerg Sonnenberger fatal("%s \"---\" at line %ld--check line numbers at line %ld\n",
69048d201a5SJoerg Sonnenberger (p_end <= p_ptrn_lines
69148d201a5SJoerg Sonnenberger ? "Premature"
69248d201a5SJoerg Sonnenberger : "Overdue"),
69348d201a5SJoerg Sonnenberger p_input_line, p_hunk_beg);
69448d201a5SJoerg Sonnenberger }
69548d201a5SJoerg Sonnenberger }
69648d201a5SJoerg Sonnenberger }
69748d201a5SJoerg Sonnenberger repl_beginning = p_end;
698*b94b84caSDaniel Fojt repl_backtrack_position = ftello(pfp);
69948d201a5SJoerg Sonnenberger repl_patch_line = p_input_line;
70048d201a5SJoerg Sonnenberger p_line[p_end] = savestr(buf);
70148d201a5SJoerg Sonnenberger if (out_of_mem) {
70248d201a5SJoerg Sonnenberger p_end--;
70348d201a5SJoerg Sonnenberger return false;
70448d201a5SJoerg Sonnenberger }
70548d201a5SJoerg Sonnenberger p_char[p_end] = '=';
70641871674SJoerg Sonnenberger for (s = buf; *s && !isdigit((unsigned char)*s); s++)
70748d201a5SJoerg Sonnenberger ;
70848d201a5SJoerg Sonnenberger if (!*s)
70948d201a5SJoerg Sonnenberger malformed();
710*b94b84caSDaniel Fojt p_newfirst = strtolinenum(s, &s);
71148d201a5SJoerg Sonnenberger if (*s == ',') {
71241871674SJoerg Sonnenberger for (; *s && !isdigit((unsigned char)*s); s++)
71348d201a5SJoerg Sonnenberger ;
71448d201a5SJoerg Sonnenberger if (!*s)
71548d201a5SJoerg Sonnenberger malformed();
716*b94b84caSDaniel Fojt p_repl_lines = strtolinenum(s, &s) -
71748d201a5SJoerg Sonnenberger p_newfirst + 1;
718*b94b84caSDaniel Fojt if (p_repl_lines < 0)
719*b94b84caSDaniel Fojt malformed();
72048d201a5SJoerg Sonnenberger } else if (p_newfirst)
72148d201a5SJoerg Sonnenberger p_repl_lines = 1;
72248d201a5SJoerg Sonnenberger else {
72348d201a5SJoerg Sonnenberger p_repl_lines = 0;
72448d201a5SJoerg Sonnenberger p_newfirst = 1;
72548d201a5SJoerg Sonnenberger }
726*b94b84caSDaniel Fojt if (p_newfirst >= LINENUM_MAX - p_repl_lines ||
727*b94b84caSDaniel Fojt p_repl_lines >= LINENUM_MAX - p_end)
728*b94b84caSDaniel Fojt malformed();
72948d201a5SJoerg Sonnenberger p_max = p_repl_lines + p_end;
73048d201a5SJoerg Sonnenberger if (p_max > MAXHUNKSIZE)
73148d201a5SJoerg Sonnenberger fatal("hunk too large (%ld lines) at line %ld: %s",
73248d201a5SJoerg Sonnenberger p_max, p_input_line, buf);
73348d201a5SJoerg Sonnenberger while (p_max >= hunkmax)
73448d201a5SJoerg Sonnenberger grow_hunkmax();
73548d201a5SJoerg Sonnenberger if (p_repl_lines != ptrn_copiable &&
73648d201a5SJoerg Sonnenberger (p_context != 0 || p_repl_lines != 1))
73748d201a5SJoerg Sonnenberger repl_could_be_missing = false;
73848d201a5SJoerg Sonnenberger break;
73948d201a5SJoerg Sonnenberger }
74048d201a5SJoerg Sonnenberger goto change_line;
74148d201a5SJoerg Sonnenberger case '+':
74248d201a5SJoerg Sonnenberger case '!':
74348d201a5SJoerg Sonnenberger repl_could_be_missing = false;
74448d201a5SJoerg Sonnenberger change_line:
74548d201a5SJoerg Sonnenberger if (buf[1] == '\n' && canonicalize)
7465027f2b8SJohn Marino strlcpy(buf + 1, " \n", buf_size - 1);
747*b94b84caSDaniel Fojt if (!isspace((unsigned char)buf[1]) &&
748*b94b84caSDaniel Fojt buf[1] != '>' && buf[1] != '<' &&
74948d201a5SJoerg Sonnenberger repl_beginning && repl_could_be_missing) {
75048d201a5SJoerg Sonnenberger repl_missing = true;
75148d201a5SJoerg Sonnenberger goto hunk_done;
75248d201a5SJoerg Sonnenberger }
75348d201a5SJoerg Sonnenberger if (context >= 0) {
75448d201a5SJoerg Sonnenberger if (context < p_context)
75548d201a5SJoerg Sonnenberger p_context = context;
75648d201a5SJoerg Sonnenberger context = -1000;
75748d201a5SJoerg Sonnenberger }
75848d201a5SJoerg Sonnenberger p_line[p_end] = savestr(buf + 2);
75948d201a5SJoerg Sonnenberger if (out_of_mem) {
76048d201a5SJoerg Sonnenberger p_end--;
76148d201a5SJoerg Sonnenberger return false;
76248d201a5SJoerg Sonnenberger }
76348d201a5SJoerg Sonnenberger if (p_end == p_ptrn_lines) {
76448d201a5SJoerg Sonnenberger if (remove_special_line()) {
7655027f2b8SJohn Marino int l;
76648d201a5SJoerg Sonnenberger
7675027f2b8SJohn Marino l = strlen(p_line[p_end]) - 1;
7685027f2b8SJohn Marino (p_line[p_end])[l] = 0;
76948d201a5SJoerg Sonnenberger }
77048d201a5SJoerg Sonnenberger }
77148d201a5SJoerg Sonnenberger break;
77248d201a5SJoerg Sonnenberger case '\t':
77348d201a5SJoerg Sonnenberger case '\n': /* assume the 2 spaces got eaten */
77448d201a5SJoerg Sonnenberger if (repl_beginning && repl_could_be_missing &&
77548d201a5SJoerg Sonnenberger (!ptrn_spaces_eaten ||
77648d201a5SJoerg Sonnenberger diff_type == NEW_CONTEXT_DIFF)) {
77748d201a5SJoerg Sonnenberger repl_missing = true;
77848d201a5SJoerg Sonnenberger goto hunk_done;
77948d201a5SJoerg Sonnenberger }
78048d201a5SJoerg Sonnenberger p_line[p_end] = savestr(buf);
78148d201a5SJoerg Sonnenberger if (out_of_mem) {
78248d201a5SJoerg Sonnenberger p_end--;
78348d201a5SJoerg Sonnenberger return false;
78448d201a5SJoerg Sonnenberger }
78548d201a5SJoerg Sonnenberger if (p_end != p_ptrn_lines + 1) {
78648d201a5SJoerg Sonnenberger ptrn_spaces_eaten |= (repl_beginning != 0);
78748d201a5SJoerg Sonnenberger context++;
78848d201a5SJoerg Sonnenberger if (!repl_beginning)
78948d201a5SJoerg Sonnenberger ptrn_copiable++;
79048d201a5SJoerg Sonnenberger p_char[p_end] = ' ';
79148d201a5SJoerg Sonnenberger }
79248d201a5SJoerg Sonnenberger break;
79348d201a5SJoerg Sonnenberger case ' ':
79441871674SJoerg Sonnenberger if (!isspace((unsigned char)buf[1]) &&
79548d201a5SJoerg Sonnenberger repl_beginning && repl_could_be_missing) {
79648d201a5SJoerg Sonnenberger repl_missing = true;
79748d201a5SJoerg Sonnenberger goto hunk_done;
79848d201a5SJoerg Sonnenberger }
79948d201a5SJoerg Sonnenberger context++;
80048d201a5SJoerg Sonnenberger if (!repl_beginning)
80148d201a5SJoerg Sonnenberger ptrn_copiable++;
80248d201a5SJoerg Sonnenberger p_line[p_end] = savestr(buf + 2);
80348d201a5SJoerg Sonnenberger if (out_of_mem) {
80448d201a5SJoerg Sonnenberger p_end--;
80548d201a5SJoerg Sonnenberger return false;
80648d201a5SJoerg Sonnenberger }
80748d201a5SJoerg Sonnenberger break;
80848d201a5SJoerg Sonnenberger default:
80948d201a5SJoerg Sonnenberger if (repl_beginning && repl_could_be_missing) {
81048d201a5SJoerg Sonnenberger repl_missing = true;
81148d201a5SJoerg Sonnenberger goto hunk_done;
81248d201a5SJoerg Sonnenberger }
81348d201a5SJoerg Sonnenberger malformed();
81448d201a5SJoerg Sonnenberger }
81548d201a5SJoerg Sonnenberger /* set up p_len for strncmp() so we don't have to */
81648d201a5SJoerg Sonnenberger /* assume null termination */
81748d201a5SJoerg Sonnenberger if (p_line[p_end])
81848d201a5SJoerg Sonnenberger p_len[p_end] = strlen(p_line[p_end]);
81948d201a5SJoerg Sonnenberger else
82048d201a5SJoerg Sonnenberger p_len[p_end] = 0;
82148d201a5SJoerg Sonnenberger }
82248d201a5SJoerg Sonnenberger
82348d201a5SJoerg Sonnenberger hunk_done:
82448d201a5SJoerg Sonnenberger if (p_end >= 0 && !repl_beginning)
82548d201a5SJoerg Sonnenberger fatal("no --- found in patch at line %ld\n", pch_hunk_beg());
82648d201a5SJoerg Sonnenberger
82748d201a5SJoerg Sonnenberger if (repl_missing) {
82848d201a5SJoerg Sonnenberger
82948d201a5SJoerg Sonnenberger /* reset state back to just after --- */
83048d201a5SJoerg Sonnenberger p_input_line = repl_patch_line;
83148d201a5SJoerg Sonnenberger for (p_end--; p_end > repl_beginning; p_end--)
83248d201a5SJoerg Sonnenberger free(p_line[p_end]);
833*b94b84caSDaniel Fojt fseeko(pfp, repl_backtrack_position, SEEK_SET);
83448d201a5SJoerg Sonnenberger
83548d201a5SJoerg Sonnenberger /* redundant 'new' context lines were omitted - set */
83648d201a5SJoerg Sonnenberger /* up to fill them in from the old file context */
83748d201a5SJoerg Sonnenberger if (!p_context && p_repl_lines == 1) {
83848d201a5SJoerg Sonnenberger p_repl_lines = 0;
83948d201a5SJoerg Sonnenberger p_max--;
84048d201a5SJoerg Sonnenberger }
84148d201a5SJoerg Sonnenberger fillsrc = 1;
84248d201a5SJoerg Sonnenberger filldst = repl_beginning + 1;
84348d201a5SJoerg Sonnenberger fillcnt = p_repl_lines;
84448d201a5SJoerg Sonnenberger p_end = p_max;
84548d201a5SJoerg Sonnenberger } else if (!p_context && fillcnt == 1) {
84648d201a5SJoerg Sonnenberger /* the first hunk was a null hunk with no context */
84748d201a5SJoerg Sonnenberger /* and we were expecting one line -- fix it up. */
84848d201a5SJoerg Sonnenberger while (filldst < p_end) {
84948d201a5SJoerg Sonnenberger p_line[filldst] = p_line[filldst + 1];
85048d201a5SJoerg Sonnenberger p_char[filldst] = p_char[filldst + 1];
85148d201a5SJoerg Sonnenberger p_len[filldst] = p_len[filldst + 1];
85248d201a5SJoerg Sonnenberger filldst++;
85348d201a5SJoerg Sonnenberger }
85448d201a5SJoerg Sonnenberger #if 0
85548d201a5SJoerg Sonnenberger repl_beginning--; /* this doesn't need to be fixed */
85648d201a5SJoerg Sonnenberger #endif
85748d201a5SJoerg Sonnenberger p_end--;
85848d201a5SJoerg Sonnenberger p_first++; /* do append rather than insert */
85948d201a5SJoerg Sonnenberger fillcnt = 0;
86048d201a5SJoerg Sonnenberger p_ptrn_lines = 0;
86148d201a5SJoerg Sonnenberger }
86248d201a5SJoerg Sonnenberger if (diff_type == CONTEXT_DIFF &&
86348d201a5SJoerg Sonnenberger (fillcnt || (p_first > 1 && ptrn_copiable > 2 * p_context))) {
86448d201a5SJoerg Sonnenberger if (verbose)
86548d201a5SJoerg Sonnenberger say("%s\n%s\n%s\n",
86648d201a5SJoerg Sonnenberger "(Fascinating--this is really a new-style context diff but without",
86748d201a5SJoerg Sonnenberger "the telltale extra asterisks on the *** line that usually indicate",
86848d201a5SJoerg Sonnenberger "the new style...)");
86948d201a5SJoerg Sonnenberger diff_type = NEW_CONTEXT_DIFF;
87048d201a5SJoerg Sonnenberger }
87148d201a5SJoerg Sonnenberger /* if there were omitted context lines, fill them in now */
87248d201a5SJoerg Sonnenberger if (fillcnt) {
87348d201a5SJoerg Sonnenberger p_bfake = filldst; /* remember where not to free() */
87448d201a5SJoerg Sonnenberger p_efake = filldst + fillcnt - 1;
87548d201a5SJoerg Sonnenberger while (fillcnt-- > 0) {
87648d201a5SJoerg Sonnenberger while (fillsrc <= p_end && p_char[fillsrc] != ' ')
87748d201a5SJoerg Sonnenberger fillsrc++;
87848d201a5SJoerg Sonnenberger if (fillsrc > p_end)
87948d201a5SJoerg Sonnenberger fatal("replacement text or line numbers mangled in hunk at line %ld\n",
88048d201a5SJoerg Sonnenberger p_hunk_beg);
88148d201a5SJoerg Sonnenberger p_line[filldst] = p_line[fillsrc];
88248d201a5SJoerg Sonnenberger p_char[filldst] = p_char[fillsrc];
88348d201a5SJoerg Sonnenberger p_len[filldst] = p_len[fillsrc];
88448d201a5SJoerg Sonnenberger fillsrc++;
88548d201a5SJoerg Sonnenberger filldst++;
88648d201a5SJoerg Sonnenberger }
88748d201a5SJoerg Sonnenberger while (fillsrc <= p_end && fillsrc != repl_beginning &&
88848d201a5SJoerg Sonnenberger p_char[fillsrc] != ' ')
88948d201a5SJoerg Sonnenberger fillsrc++;
89048d201a5SJoerg Sonnenberger #ifdef DEBUGGING
89148d201a5SJoerg Sonnenberger if (debug & 64)
89248d201a5SJoerg Sonnenberger printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n",
89348d201a5SJoerg Sonnenberger fillsrc, filldst, repl_beginning, p_end + 1);
89448d201a5SJoerg Sonnenberger #endif
89548d201a5SJoerg Sonnenberger if (fillsrc != p_end + 1 && fillsrc != repl_beginning)
89648d201a5SJoerg Sonnenberger malformed();
89748d201a5SJoerg Sonnenberger if (filldst != p_end + 1 && filldst != repl_beginning)
89848d201a5SJoerg Sonnenberger malformed();
89948d201a5SJoerg Sonnenberger }
90048d201a5SJoerg Sonnenberger if (p_line[p_end] != NULL) {
90148d201a5SJoerg Sonnenberger if (remove_special_line()) {
90248d201a5SJoerg Sonnenberger p_len[p_end] -= 1;
90348d201a5SJoerg Sonnenberger (p_line[p_end])[p_len[p_end]] = 0;
90448d201a5SJoerg Sonnenberger }
90548d201a5SJoerg Sonnenberger }
90648d201a5SJoerg Sonnenberger } else if (diff_type == UNI_DIFF) {
907f9ea5d32SJoerg Sonnenberger LINENUM fillold; /* index of old lines */
908f9ea5d32SJoerg Sonnenberger LINENUM fillnew; /* index of new lines */
90948d201a5SJoerg Sonnenberger char ch;
91048d201a5SJoerg Sonnenberger
911*b94b84caSDaniel Fojt line_beginning = ftello(pfp); /* file pos of the current line */
9125027f2b8SJohn Marino len = pgets(true);
91348d201a5SJoerg Sonnenberger p_input_line++;
9145027f2b8SJohn Marino if (len == 0 || strnNE(buf, "@@ -", 4)) {
91548d201a5SJoerg Sonnenberger next_intuit_at(line_beginning, p_input_line);
91648d201a5SJoerg Sonnenberger return false;
91748d201a5SJoerg Sonnenberger }
91848d201a5SJoerg Sonnenberger s = buf + 4;
91948d201a5SJoerg Sonnenberger if (!*s)
92048d201a5SJoerg Sonnenberger malformed();
921*b94b84caSDaniel Fojt p_first = strtolinenum(s, &s);
92248d201a5SJoerg Sonnenberger if (*s == ',') {
923*b94b84caSDaniel Fojt p_ptrn_lines = strtolinenum(s + 1, &s);
92448d201a5SJoerg Sonnenberger } else
92548d201a5SJoerg Sonnenberger p_ptrn_lines = 1;
92648d201a5SJoerg Sonnenberger if (*s == ' ')
92748d201a5SJoerg Sonnenberger s++;
92848d201a5SJoerg Sonnenberger if (*s != '+' || !*++s)
92948d201a5SJoerg Sonnenberger malformed();
930*b94b84caSDaniel Fojt p_newfirst = strtolinenum(s, &s);
93148d201a5SJoerg Sonnenberger if (*s == ',') {
932*b94b84caSDaniel Fojt p_repl_lines = strtolinenum(s + 1, &s);
93348d201a5SJoerg Sonnenberger } else
93448d201a5SJoerg Sonnenberger p_repl_lines = 1;
93548d201a5SJoerg Sonnenberger if (*s == ' ')
93648d201a5SJoerg Sonnenberger s++;
93748d201a5SJoerg Sonnenberger if (*s != '@')
93848d201a5SJoerg Sonnenberger malformed();
939*b94b84caSDaniel Fojt if (p_first >= LINENUM_MAX - p_ptrn_lines ||
940*b94b84caSDaniel Fojt p_newfirst > LINENUM_MAX - p_repl_lines ||
941*b94b84caSDaniel Fojt p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1)
942*b94b84caSDaniel Fojt malformed();
94348d201a5SJoerg Sonnenberger if (!p_ptrn_lines)
94448d201a5SJoerg Sonnenberger p_first++; /* do append rather than insert */
94548d201a5SJoerg Sonnenberger p_max = p_ptrn_lines + p_repl_lines + 1;
94648d201a5SJoerg Sonnenberger while (p_max >= hunkmax)
94748d201a5SJoerg Sonnenberger grow_hunkmax();
948f9ea5d32SJoerg Sonnenberger fillold = 1;
949f9ea5d32SJoerg Sonnenberger fillnew = fillold + p_ptrn_lines;
950f9ea5d32SJoerg Sonnenberger p_end = fillnew + p_repl_lines;
9515027f2b8SJohn Marino snprintf(buf, buf_size, "*** %ld,%ld ****\n", p_first,
95248d201a5SJoerg Sonnenberger p_first + p_ptrn_lines - 1);
95348d201a5SJoerg Sonnenberger p_line[0] = savestr(buf);
95448d201a5SJoerg Sonnenberger if (out_of_mem) {
95548d201a5SJoerg Sonnenberger p_end = -1;
95648d201a5SJoerg Sonnenberger return false;
95748d201a5SJoerg Sonnenberger }
95848d201a5SJoerg Sonnenberger p_char[0] = '*';
9595027f2b8SJohn Marino snprintf(buf, buf_size, "--- %ld,%ld ----\n", p_newfirst,
96048d201a5SJoerg Sonnenberger p_newfirst + p_repl_lines - 1);
961f9ea5d32SJoerg Sonnenberger p_line[fillnew] = savestr(buf);
96248d201a5SJoerg Sonnenberger if (out_of_mem) {
96348d201a5SJoerg Sonnenberger p_end = 0;
96448d201a5SJoerg Sonnenberger return false;
96548d201a5SJoerg Sonnenberger }
966f9ea5d32SJoerg Sonnenberger p_char[fillnew++] = '=';
96748d201a5SJoerg Sonnenberger p_context = 100;
96848d201a5SJoerg Sonnenberger context = 0;
96948d201a5SJoerg Sonnenberger p_hunk_beg = p_input_line + 1;
970f9ea5d32SJoerg Sonnenberger while (fillold <= p_ptrn_lines || fillnew <= p_end) {
971*b94b84caSDaniel Fojt line_beginning = ftello(pfp);
9725027f2b8SJohn Marino len = pgets(true);
97348d201a5SJoerg Sonnenberger p_input_line++;
9745027f2b8SJohn Marino if (len == 0) {
975f9ea5d32SJoerg Sonnenberger if (p_max - fillnew < 3) {
97648d201a5SJoerg Sonnenberger /* assume blank lines got chopped */
9775027f2b8SJohn Marino strlcpy(buf, " \n", buf_size);
97848d201a5SJoerg Sonnenberger } else {
97948d201a5SJoerg Sonnenberger fatal("unexpected end of file in patch\n");
98048d201a5SJoerg Sonnenberger }
98148d201a5SJoerg Sonnenberger }
98248d201a5SJoerg Sonnenberger if (*buf == '\t' || *buf == '\n') {
98348d201a5SJoerg Sonnenberger ch = ' '; /* assume the space got eaten */
98448d201a5SJoerg Sonnenberger s = savestr(buf);
98548d201a5SJoerg Sonnenberger } else {
98648d201a5SJoerg Sonnenberger ch = *buf;
98748d201a5SJoerg Sonnenberger s = savestr(buf + 1);
98848d201a5SJoerg Sonnenberger }
98948d201a5SJoerg Sonnenberger if (out_of_mem) {
990f9ea5d32SJoerg Sonnenberger while (--fillnew > p_ptrn_lines)
991f9ea5d32SJoerg Sonnenberger free(p_line[fillnew]);
992f9ea5d32SJoerg Sonnenberger p_end = fillold - 1;
99348d201a5SJoerg Sonnenberger return false;
99448d201a5SJoerg Sonnenberger }
99548d201a5SJoerg Sonnenberger switch (ch) {
99648d201a5SJoerg Sonnenberger case '-':
997f9ea5d32SJoerg Sonnenberger if (fillold > p_ptrn_lines) {
99848d201a5SJoerg Sonnenberger free(s);
999f9ea5d32SJoerg Sonnenberger p_end = fillnew - 1;
100048d201a5SJoerg Sonnenberger malformed();
100148d201a5SJoerg Sonnenberger }
1002f9ea5d32SJoerg Sonnenberger p_char[fillold] = ch;
1003f9ea5d32SJoerg Sonnenberger p_line[fillold] = s;
1004f9ea5d32SJoerg Sonnenberger p_len[fillold++] = strlen(s);
1005f9ea5d32SJoerg Sonnenberger if (fillold > p_ptrn_lines) {
100648d201a5SJoerg Sonnenberger if (remove_special_line()) {
1007f9ea5d32SJoerg Sonnenberger p_len[fillold - 1] -= 1;
1008f9ea5d32SJoerg Sonnenberger s[p_len[fillold - 1]] = 0;
100948d201a5SJoerg Sonnenberger }
101048d201a5SJoerg Sonnenberger }
101148d201a5SJoerg Sonnenberger break;
101248d201a5SJoerg Sonnenberger case '=':
101348d201a5SJoerg Sonnenberger ch = ' ';
101448d201a5SJoerg Sonnenberger /* FALL THROUGH */
101548d201a5SJoerg Sonnenberger case ' ':
1016f9ea5d32SJoerg Sonnenberger if (fillold > p_ptrn_lines) {
101748d201a5SJoerg Sonnenberger free(s);
1018f9ea5d32SJoerg Sonnenberger while (--fillnew > p_ptrn_lines)
1019f9ea5d32SJoerg Sonnenberger free(p_line[fillnew]);
1020f9ea5d32SJoerg Sonnenberger p_end = fillold - 1;
102148d201a5SJoerg Sonnenberger malformed();
102248d201a5SJoerg Sonnenberger }
102348d201a5SJoerg Sonnenberger context++;
1024f9ea5d32SJoerg Sonnenberger p_char[fillold] = ch;
1025f9ea5d32SJoerg Sonnenberger p_line[fillold] = s;
1026f9ea5d32SJoerg Sonnenberger p_len[fillold++] = strlen(s);
102748d201a5SJoerg Sonnenberger s = savestr(s);
102848d201a5SJoerg Sonnenberger if (out_of_mem) {
1029f9ea5d32SJoerg Sonnenberger while (--fillnew > p_ptrn_lines)
1030f9ea5d32SJoerg Sonnenberger free(p_line[fillnew]);
1031f9ea5d32SJoerg Sonnenberger p_end = fillold - 1;
103248d201a5SJoerg Sonnenberger return false;
103348d201a5SJoerg Sonnenberger }
1034f9ea5d32SJoerg Sonnenberger if (fillold > p_ptrn_lines) {
103548d201a5SJoerg Sonnenberger if (remove_special_line()) {
1036f9ea5d32SJoerg Sonnenberger p_len[fillold - 1] -= 1;
1037f9ea5d32SJoerg Sonnenberger s[p_len[fillold - 1]] = 0;
103848d201a5SJoerg Sonnenberger }
103948d201a5SJoerg Sonnenberger }
104048d201a5SJoerg Sonnenberger /* FALL THROUGH */
104148d201a5SJoerg Sonnenberger case '+':
1042f9ea5d32SJoerg Sonnenberger if (fillnew > p_end) {
104348d201a5SJoerg Sonnenberger free(s);
1044f9ea5d32SJoerg Sonnenberger while (--fillnew > p_ptrn_lines)
1045f9ea5d32SJoerg Sonnenberger free(p_line[fillnew]);
1046f9ea5d32SJoerg Sonnenberger p_end = fillold - 1;
104748d201a5SJoerg Sonnenberger malformed();
104848d201a5SJoerg Sonnenberger }
1049f9ea5d32SJoerg Sonnenberger p_char[fillnew] = ch;
1050f9ea5d32SJoerg Sonnenberger p_line[fillnew] = s;
1051f9ea5d32SJoerg Sonnenberger p_len[fillnew++] = strlen(s);
1052f9ea5d32SJoerg Sonnenberger if (fillold > p_ptrn_lines) {
105348d201a5SJoerg Sonnenberger if (remove_special_line()) {
1054f9ea5d32SJoerg Sonnenberger p_len[fillnew - 1] -= 1;
1055f9ea5d32SJoerg Sonnenberger s[p_len[fillnew - 1]] = 0;
105648d201a5SJoerg Sonnenberger }
105748d201a5SJoerg Sonnenberger }
105848d201a5SJoerg Sonnenberger break;
105948d201a5SJoerg Sonnenberger default:
1060f9ea5d32SJoerg Sonnenberger p_end = fillnew;
106148d201a5SJoerg Sonnenberger malformed();
106248d201a5SJoerg Sonnenberger }
106348d201a5SJoerg Sonnenberger if (ch != ' ' && context > 0) {
106448d201a5SJoerg Sonnenberger if (context < p_context)
106548d201a5SJoerg Sonnenberger p_context = context;
106648d201a5SJoerg Sonnenberger context = -1000;
106748d201a5SJoerg Sonnenberger }
106848d201a5SJoerg Sonnenberger } /* while */
106948d201a5SJoerg Sonnenberger } else { /* normal diff--fake it up */
107048d201a5SJoerg Sonnenberger char hunk_type;
107148d201a5SJoerg Sonnenberger int i;
107248d201a5SJoerg Sonnenberger LINENUM min, max;
107348d201a5SJoerg Sonnenberger
1074*b94b84caSDaniel Fojt line_beginning = ftello(pfp);
107548d201a5SJoerg Sonnenberger p_context = 0;
10765027f2b8SJohn Marino len = pgets(true);
107748d201a5SJoerg Sonnenberger p_input_line++;
10785027f2b8SJohn Marino if (len == 0 || !isdigit((unsigned char)*buf)) {
107948d201a5SJoerg Sonnenberger next_intuit_at(line_beginning, p_input_line);
108048d201a5SJoerg Sonnenberger return false;
108148d201a5SJoerg Sonnenberger }
1082*b94b84caSDaniel Fojt p_first = strtolinenum(buf, &s);
108348d201a5SJoerg Sonnenberger if (*s == ',') {
1084*b94b84caSDaniel Fojt p_ptrn_lines = strtolinenum(s + 1, &s) - p_first + 1;
1085*b94b84caSDaniel Fojt if (p_ptrn_lines < 0)
1086*b94b84caSDaniel Fojt malformed();
108748d201a5SJoerg Sonnenberger } else
108848d201a5SJoerg Sonnenberger p_ptrn_lines = (*s != 'a');
108948d201a5SJoerg Sonnenberger hunk_type = *s;
109048d201a5SJoerg Sonnenberger if (hunk_type == 'a')
109148d201a5SJoerg Sonnenberger p_first++; /* do append rather than insert */
1092*b94b84caSDaniel Fojt min = strtolinenum(s + 1, &s);
109348d201a5SJoerg Sonnenberger if (*s == ',')
1094*b94b84caSDaniel Fojt max = strtolinenum(s + 1, &s);
109548d201a5SJoerg Sonnenberger else
109648d201a5SJoerg Sonnenberger max = min;
1097*b94b84caSDaniel Fojt if (min < 0 || min > max || max - min == LINENUM_MAX)
1098*b94b84caSDaniel Fojt malformed();
109948d201a5SJoerg Sonnenberger if (hunk_type == 'd')
110048d201a5SJoerg Sonnenberger min++;
1101*b94b84caSDaniel Fojt p_newfirst = min;
1102*b94b84caSDaniel Fojt p_repl_lines = max - min + 1;
1103*b94b84caSDaniel Fojt if (p_newfirst > LINENUM_MAX - p_repl_lines ||
1104*b94b84caSDaniel Fojt p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1)
1105*b94b84caSDaniel Fojt malformed();
1106*b94b84caSDaniel Fojt p_end = p_ptrn_lines + p_repl_lines + 1;
110748d201a5SJoerg Sonnenberger if (p_end > MAXHUNKSIZE)
110848d201a5SJoerg Sonnenberger fatal("hunk too large (%ld lines) at line %ld: %s",
110948d201a5SJoerg Sonnenberger p_end, p_input_line, buf);
111048d201a5SJoerg Sonnenberger while (p_end >= hunkmax)
111148d201a5SJoerg Sonnenberger grow_hunkmax();
11125027f2b8SJohn Marino snprintf(buf, buf_size, "*** %ld,%ld\n", p_first,
111348d201a5SJoerg Sonnenberger p_first + p_ptrn_lines - 1);
111448d201a5SJoerg Sonnenberger p_line[0] = savestr(buf);
111548d201a5SJoerg Sonnenberger if (out_of_mem) {
111648d201a5SJoerg Sonnenberger p_end = -1;
111748d201a5SJoerg Sonnenberger return false;
111848d201a5SJoerg Sonnenberger }
111948d201a5SJoerg Sonnenberger p_char[0] = '*';
112048d201a5SJoerg Sonnenberger for (i = 1; i <= p_ptrn_lines; i++) {
11215027f2b8SJohn Marino len = pgets(true);
112248d201a5SJoerg Sonnenberger p_input_line++;
11235027f2b8SJohn Marino if (len == 0)
112448d201a5SJoerg Sonnenberger fatal("unexpected end of file in patch at line %ld\n",
112548d201a5SJoerg Sonnenberger p_input_line);
112648d201a5SJoerg Sonnenberger if (*buf != '<')
112748d201a5SJoerg Sonnenberger fatal("< expected at line %ld of patch\n",
112848d201a5SJoerg Sonnenberger p_input_line);
112948d201a5SJoerg Sonnenberger p_line[i] = savestr(buf + 2);
113048d201a5SJoerg Sonnenberger if (out_of_mem) {
113148d201a5SJoerg Sonnenberger p_end = i - 1;
113248d201a5SJoerg Sonnenberger return false;
113348d201a5SJoerg Sonnenberger }
113448d201a5SJoerg Sonnenberger p_len[i] = strlen(p_line[i]);
113548d201a5SJoerg Sonnenberger p_char[i] = '-';
113648d201a5SJoerg Sonnenberger }
113748d201a5SJoerg Sonnenberger
113848d201a5SJoerg Sonnenberger if (remove_special_line()) {
113948d201a5SJoerg Sonnenberger p_len[i - 1] -= 1;
114048d201a5SJoerg Sonnenberger (p_line[i - 1])[p_len[i - 1]] = 0;
114148d201a5SJoerg Sonnenberger }
114248d201a5SJoerg Sonnenberger if (hunk_type == 'c') {
11435027f2b8SJohn Marino len = pgets(true);
114448d201a5SJoerg Sonnenberger p_input_line++;
11455027f2b8SJohn Marino if (len == 0)
114648d201a5SJoerg Sonnenberger fatal("unexpected end of file in patch at line %ld\n",
114748d201a5SJoerg Sonnenberger p_input_line);
114848d201a5SJoerg Sonnenberger if (*buf != '-')
114948d201a5SJoerg Sonnenberger fatal("--- expected at line %ld of patch\n",
115048d201a5SJoerg Sonnenberger p_input_line);
115148d201a5SJoerg Sonnenberger }
11525027f2b8SJohn Marino snprintf(buf, buf_size, "--- %ld,%ld\n", min, max);
115348d201a5SJoerg Sonnenberger p_line[i] = savestr(buf);
115448d201a5SJoerg Sonnenberger if (out_of_mem) {
115548d201a5SJoerg Sonnenberger p_end = i - 1;
115648d201a5SJoerg Sonnenberger return false;
115748d201a5SJoerg Sonnenberger }
115848d201a5SJoerg Sonnenberger p_char[i] = '=';
115948d201a5SJoerg Sonnenberger for (i++; i <= p_end; i++) {
11605027f2b8SJohn Marino len = pgets(true);
116148d201a5SJoerg Sonnenberger p_input_line++;
11625027f2b8SJohn Marino if (len == 0)
116348d201a5SJoerg Sonnenberger fatal("unexpected end of file in patch at line %ld\n",
116448d201a5SJoerg Sonnenberger p_input_line);
116548d201a5SJoerg Sonnenberger if (*buf != '>')
116648d201a5SJoerg Sonnenberger fatal("> expected at line %ld of patch\n",
116748d201a5SJoerg Sonnenberger p_input_line);
1168*b94b84caSDaniel Fojt /* Don't overrun if we don't have enough line */
1169*b94b84caSDaniel Fojt if (len > 2)
117048d201a5SJoerg Sonnenberger p_line[i] = savestr(buf + 2);
1171*b94b84caSDaniel Fojt else
1172*b94b84caSDaniel Fojt p_line[i] = savestr("");
1173*b94b84caSDaniel Fojt
117448d201a5SJoerg Sonnenberger if (out_of_mem) {
117548d201a5SJoerg Sonnenberger p_end = i - 1;
117648d201a5SJoerg Sonnenberger return false;
117748d201a5SJoerg Sonnenberger }
117848d201a5SJoerg Sonnenberger p_len[i] = strlen(p_line[i]);
117948d201a5SJoerg Sonnenberger p_char[i] = '+';
118048d201a5SJoerg Sonnenberger }
118148d201a5SJoerg Sonnenberger
118248d201a5SJoerg Sonnenberger if (remove_special_line()) {
118348d201a5SJoerg Sonnenberger p_len[i - 1] -= 1;
118448d201a5SJoerg Sonnenberger (p_line[i - 1])[p_len[i - 1]] = 0;
118548d201a5SJoerg Sonnenberger }
118648d201a5SJoerg Sonnenberger }
118748d201a5SJoerg Sonnenberger if (reverse) /* backwards patch? */
118848d201a5SJoerg Sonnenberger if (!pch_swap())
118948d201a5SJoerg Sonnenberger say("Not enough memory to swap next hunk!\n");
119048d201a5SJoerg Sonnenberger #ifdef DEBUGGING
119148d201a5SJoerg Sonnenberger if (debug & 2) {
1192*b94b84caSDaniel Fojt LINENUM i;
119348d201a5SJoerg Sonnenberger char special;
119448d201a5SJoerg Sonnenberger
119548d201a5SJoerg Sonnenberger for (i = 0; i <= p_end; i++) {
119648d201a5SJoerg Sonnenberger if (i == p_ptrn_lines)
119748d201a5SJoerg Sonnenberger special = '^';
119848d201a5SJoerg Sonnenberger else
119948d201a5SJoerg Sonnenberger special = ' ';
1200*b94b84caSDaniel Fojt fprintf(stderr, "%3ld %c %c %s", i, p_char[i],
120148d201a5SJoerg Sonnenberger special, p_line[i]);
120248d201a5SJoerg Sonnenberger fflush(stderr);
120348d201a5SJoerg Sonnenberger }
120448d201a5SJoerg Sonnenberger }
120548d201a5SJoerg Sonnenberger #endif
120648d201a5SJoerg Sonnenberger if (p_end + 1 < hunkmax)/* paranoia reigns supreme... */
120748d201a5SJoerg Sonnenberger p_char[p_end + 1] = '^'; /* add a stopper for apply_hunk */
120848d201a5SJoerg Sonnenberger return true;
120948d201a5SJoerg Sonnenberger }
121048d201a5SJoerg Sonnenberger
121148d201a5SJoerg Sonnenberger /*
12125027f2b8SJohn Marino * Input a line from the patch file.
12135027f2b8SJohn Marino * Worry about indentation if do_indent is true.
12145027f2b8SJohn Marino * The line is read directly into the buf global variable which
12155027f2b8SJohn Marino * is resized if necessary in order to hold the complete line.
12165027f2b8SJohn Marino * Returns the number of characters read including the terminating
12175027f2b8SJohn Marino * '\n', if any.
121848d201a5SJoerg Sonnenberger */
12195027f2b8SJohn Marino size_t
pgets(bool do_indent)12205027f2b8SJohn Marino pgets(bool do_indent)
122148d201a5SJoerg Sonnenberger {
12225027f2b8SJohn Marino char *line;
12235027f2b8SJohn Marino size_t len;
12245027f2b8SJohn Marino int indent = 0, skipped = 0;
122548d201a5SJoerg Sonnenberger
12265027f2b8SJohn Marino line = fgetln(pfp, &len);
12275027f2b8SJohn Marino if (line != NULL) {
12285027f2b8SJohn Marino if (len + 1 > buf_size) {
12295027f2b8SJohn Marino while (len + 1 > buf_size)
12305027f2b8SJohn Marino buf_size *= 2;
12315027f2b8SJohn Marino free(buf);
12325027f2b8SJohn Marino buf = malloc(buf_size);
12335027f2b8SJohn Marino if (buf == NULL)
12345027f2b8SJohn Marino fatal("out of memory\n");
12355027f2b8SJohn Marino }
12365027f2b8SJohn Marino if (do_indent == 1 && p_indent) {
12375027f2b8SJohn Marino for (;
12385027f2b8SJohn Marino indent < p_indent && (*line == ' ' || *line == '\t' || *line == 'X');
12395027f2b8SJohn Marino line++, skipped++) {
12405027f2b8SJohn Marino if (*line == '\t')
124148d201a5SJoerg Sonnenberger indent += 8 - (indent %7);
124248d201a5SJoerg Sonnenberger else
124348d201a5SJoerg Sonnenberger indent++;
124448d201a5SJoerg Sonnenberger }
124548d201a5SJoerg Sonnenberger }
12465027f2b8SJohn Marino memcpy(buf, line, len - skipped);
12475027f2b8SJohn Marino buf[len - skipped] = '\0';
124848d201a5SJoerg Sonnenberger }
12495027f2b8SJohn Marino return len;
12505027f2b8SJohn Marino }
12515027f2b8SJohn Marino
125248d201a5SJoerg Sonnenberger
125348d201a5SJoerg Sonnenberger /*
125448d201a5SJoerg Sonnenberger * Reverse the old and new portions of the current hunk.
125548d201a5SJoerg Sonnenberger */
125648d201a5SJoerg Sonnenberger bool
pch_swap(void)125748d201a5SJoerg Sonnenberger pch_swap(void)
125848d201a5SJoerg Sonnenberger {
125948d201a5SJoerg Sonnenberger char **tp_line; /* the text of the hunk */
1260*b94b84caSDaniel Fojt unsigned short *tp_len;/* length of each line */
126148d201a5SJoerg Sonnenberger char *tp_char; /* +, -, and ! */
126248d201a5SJoerg Sonnenberger LINENUM i;
126348d201a5SJoerg Sonnenberger LINENUM n;
126448d201a5SJoerg Sonnenberger bool blankline = false;
126548d201a5SJoerg Sonnenberger char *s;
126648d201a5SJoerg Sonnenberger
126748d201a5SJoerg Sonnenberger i = p_first;
126848d201a5SJoerg Sonnenberger p_first = p_newfirst;
126948d201a5SJoerg Sonnenberger p_newfirst = i;
127048d201a5SJoerg Sonnenberger
127148d201a5SJoerg Sonnenberger /* make a scratch copy */
127248d201a5SJoerg Sonnenberger
127348d201a5SJoerg Sonnenberger tp_line = p_line;
127448d201a5SJoerg Sonnenberger tp_len = p_len;
127548d201a5SJoerg Sonnenberger tp_char = p_char;
127648d201a5SJoerg Sonnenberger p_line = NULL; /* force set_hunkmax to allocate again */
127748d201a5SJoerg Sonnenberger p_len = NULL;
127848d201a5SJoerg Sonnenberger p_char = NULL;
127948d201a5SJoerg Sonnenberger set_hunkmax();
128048d201a5SJoerg Sonnenberger if (p_line == NULL || p_len == NULL || p_char == NULL) {
128148d201a5SJoerg Sonnenberger
128248d201a5SJoerg Sonnenberger free(p_line);
128348d201a5SJoerg Sonnenberger p_line = tp_line;
128448d201a5SJoerg Sonnenberger free(p_len);
128548d201a5SJoerg Sonnenberger p_len = tp_len;
128648d201a5SJoerg Sonnenberger free(p_char);
128748d201a5SJoerg Sonnenberger p_char = tp_char;
128848d201a5SJoerg Sonnenberger return false; /* not enough memory to swap hunk! */
128948d201a5SJoerg Sonnenberger }
129048d201a5SJoerg Sonnenberger /* now turn the new into the old */
129148d201a5SJoerg Sonnenberger
129248d201a5SJoerg Sonnenberger i = p_ptrn_lines + 1;
129348d201a5SJoerg Sonnenberger if (tp_char[i] == '\n') { /* account for possible blank line */
129448d201a5SJoerg Sonnenberger blankline = true;
129548d201a5SJoerg Sonnenberger i++;
129648d201a5SJoerg Sonnenberger }
129748d201a5SJoerg Sonnenberger if (p_efake >= 0) { /* fix non-freeable ptr range */
129848d201a5SJoerg Sonnenberger if (p_efake <= i)
129948d201a5SJoerg Sonnenberger n = p_end - i + 1;
130048d201a5SJoerg Sonnenberger else
130148d201a5SJoerg Sonnenberger n = -i;
130248d201a5SJoerg Sonnenberger p_efake += n;
130348d201a5SJoerg Sonnenberger p_bfake += n;
130448d201a5SJoerg Sonnenberger }
130548d201a5SJoerg Sonnenberger for (n = 0; i <= p_end; i++, n++) {
130648d201a5SJoerg Sonnenberger p_line[n] = tp_line[i];
130748d201a5SJoerg Sonnenberger p_char[n] = tp_char[i];
130848d201a5SJoerg Sonnenberger if (p_char[n] == '+')
130948d201a5SJoerg Sonnenberger p_char[n] = '-';
131048d201a5SJoerg Sonnenberger p_len[n] = tp_len[i];
131148d201a5SJoerg Sonnenberger }
131248d201a5SJoerg Sonnenberger if (blankline) {
131348d201a5SJoerg Sonnenberger i = p_ptrn_lines + 1;
131448d201a5SJoerg Sonnenberger p_line[n] = tp_line[i];
131548d201a5SJoerg Sonnenberger p_char[n] = tp_char[i];
131648d201a5SJoerg Sonnenberger p_len[n] = tp_len[i];
131748d201a5SJoerg Sonnenberger n++;
131848d201a5SJoerg Sonnenberger }
131948d201a5SJoerg Sonnenberger if (p_char[0] != '=')
132048d201a5SJoerg Sonnenberger fatal("Malformed patch at line %ld: expected '=' found '%c'\n",
132148d201a5SJoerg Sonnenberger p_input_line, p_char[0]);
132248d201a5SJoerg Sonnenberger p_char[0] = '*';
132348d201a5SJoerg Sonnenberger for (s = p_line[0]; *s; s++)
132448d201a5SJoerg Sonnenberger if (*s == '-')
132548d201a5SJoerg Sonnenberger *s = '*';
132648d201a5SJoerg Sonnenberger
132748d201a5SJoerg Sonnenberger /* now turn the old into the new */
132848d201a5SJoerg Sonnenberger
132948d201a5SJoerg Sonnenberger if (p_char[0] != '*')
133048d201a5SJoerg Sonnenberger fatal("Malformed patch at line %ld: expected '*' found '%c'\n",
133148d201a5SJoerg Sonnenberger p_input_line, p_char[0]);
133248d201a5SJoerg Sonnenberger tp_char[0] = '=';
133348d201a5SJoerg Sonnenberger for (s = tp_line[0]; *s; s++)
133448d201a5SJoerg Sonnenberger if (*s == '*')
133548d201a5SJoerg Sonnenberger *s = '-';
133648d201a5SJoerg Sonnenberger for (i = 0; n <= p_end; i++, n++) {
133748d201a5SJoerg Sonnenberger p_line[n] = tp_line[i];
133848d201a5SJoerg Sonnenberger p_char[n] = tp_char[i];
133948d201a5SJoerg Sonnenberger if (p_char[n] == '-')
134048d201a5SJoerg Sonnenberger p_char[n] = '+';
134148d201a5SJoerg Sonnenberger p_len[n] = tp_len[i];
134248d201a5SJoerg Sonnenberger }
134348d201a5SJoerg Sonnenberger
134448d201a5SJoerg Sonnenberger if (i != p_ptrn_lines + 1)
134548d201a5SJoerg Sonnenberger fatal("Malformed patch at line %ld: expected %ld lines, "
134648d201a5SJoerg Sonnenberger "got %ld\n",
134748d201a5SJoerg Sonnenberger p_input_line, p_ptrn_lines + 1, i);
134848d201a5SJoerg Sonnenberger
134948d201a5SJoerg Sonnenberger i = p_ptrn_lines;
135048d201a5SJoerg Sonnenberger p_ptrn_lines = p_repl_lines;
135148d201a5SJoerg Sonnenberger p_repl_lines = i;
135248d201a5SJoerg Sonnenberger
135348d201a5SJoerg Sonnenberger free(tp_line);
135448d201a5SJoerg Sonnenberger free(tp_len);
135548d201a5SJoerg Sonnenberger free(tp_char);
135648d201a5SJoerg Sonnenberger
135748d201a5SJoerg Sonnenberger return true;
135848d201a5SJoerg Sonnenberger }
135948d201a5SJoerg Sonnenberger
136048d201a5SJoerg Sonnenberger /*
136148d201a5SJoerg Sonnenberger * Return the specified line position in the old file of the old context.
136248d201a5SJoerg Sonnenberger */
136348d201a5SJoerg Sonnenberger LINENUM
pch_first(void)136448d201a5SJoerg Sonnenberger pch_first(void)
136548d201a5SJoerg Sonnenberger {
136648d201a5SJoerg Sonnenberger return p_first;
136748d201a5SJoerg Sonnenberger }
136848d201a5SJoerg Sonnenberger
136948d201a5SJoerg Sonnenberger /*
137048d201a5SJoerg Sonnenberger * Return the number of lines of old context.
137148d201a5SJoerg Sonnenberger */
137248d201a5SJoerg Sonnenberger LINENUM
pch_ptrn_lines(void)137348d201a5SJoerg Sonnenberger pch_ptrn_lines(void)
137448d201a5SJoerg Sonnenberger {
137548d201a5SJoerg Sonnenberger return p_ptrn_lines;
137648d201a5SJoerg Sonnenberger }
137748d201a5SJoerg Sonnenberger
137848d201a5SJoerg Sonnenberger /*
137948d201a5SJoerg Sonnenberger * Return the probable line position in the new file of the first line.
138048d201a5SJoerg Sonnenberger */
138148d201a5SJoerg Sonnenberger LINENUM
pch_newfirst(void)138248d201a5SJoerg Sonnenberger pch_newfirst(void)
138348d201a5SJoerg Sonnenberger {
138448d201a5SJoerg Sonnenberger return p_newfirst;
138548d201a5SJoerg Sonnenberger }
138648d201a5SJoerg Sonnenberger
138748d201a5SJoerg Sonnenberger /*
138848d201a5SJoerg Sonnenberger * Return the number of lines in the replacement text including context.
138948d201a5SJoerg Sonnenberger */
139048d201a5SJoerg Sonnenberger LINENUM
pch_repl_lines(void)139148d201a5SJoerg Sonnenberger pch_repl_lines(void)
139248d201a5SJoerg Sonnenberger {
139348d201a5SJoerg Sonnenberger return p_repl_lines;
139448d201a5SJoerg Sonnenberger }
139548d201a5SJoerg Sonnenberger
139648d201a5SJoerg Sonnenberger /*
139748d201a5SJoerg Sonnenberger * Return the number of lines in the whole hunk.
139848d201a5SJoerg Sonnenberger */
139948d201a5SJoerg Sonnenberger LINENUM
pch_end(void)140048d201a5SJoerg Sonnenberger pch_end(void)
140148d201a5SJoerg Sonnenberger {
140248d201a5SJoerg Sonnenberger return p_end;
140348d201a5SJoerg Sonnenberger }
140448d201a5SJoerg Sonnenberger
140548d201a5SJoerg Sonnenberger /*
140648d201a5SJoerg Sonnenberger * Return the number of context lines before the first changed line.
140748d201a5SJoerg Sonnenberger */
140848d201a5SJoerg Sonnenberger LINENUM
pch_context(void)140948d201a5SJoerg Sonnenberger pch_context(void)
141048d201a5SJoerg Sonnenberger {
141148d201a5SJoerg Sonnenberger return p_context;
141248d201a5SJoerg Sonnenberger }
141348d201a5SJoerg Sonnenberger
141448d201a5SJoerg Sonnenberger /*
141548d201a5SJoerg Sonnenberger * Return the length of a particular patch line.
141648d201a5SJoerg Sonnenberger */
1417*b94b84caSDaniel Fojt unsigned short
pch_line_len(LINENUM line)141848d201a5SJoerg Sonnenberger pch_line_len(LINENUM line)
141948d201a5SJoerg Sonnenberger {
142048d201a5SJoerg Sonnenberger return p_len[line];
142148d201a5SJoerg Sonnenberger }
142248d201a5SJoerg Sonnenberger
142348d201a5SJoerg Sonnenberger /*
142448d201a5SJoerg Sonnenberger * Return the control character (+, -, *, !, etc) for a patch line.
142548d201a5SJoerg Sonnenberger */
142648d201a5SJoerg Sonnenberger char
pch_char(LINENUM line)142748d201a5SJoerg Sonnenberger pch_char(LINENUM line)
142848d201a5SJoerg Sonnenberger {
142948d201a5SJoerg Sonnenberger return p_char[line];
143048d201a5SJoerg Sonnenberger }
143148d201a5SJoerg Sonnenberger
143248d201a5SJoerg Sonnenberger /*
143348d201a5SJoerg Sonnenberger * Return a pointer to a particular patch line.
143448d201a5SJoerg Sonnenberger */
143548d201a5SJoerg Sonnenberger char *
pfetch(LINENUM line)143648d201a5SJoerg Sonnenberger pfetch(LINENUM line)
143748d201a5SJoerg Sonnenberger {
143848d201a5SJoerg Sonnenberger return p_line[line];
143948d201a5SJoerg Sonnenberger }
144048d201a5SJoerg Sonnenberger
144148d201a5SJoerg Sonnenberger /*
144248d201a5SJoerg Sonnenberger * Return where in the patch file this hunk began, for error messages.
144348d201a5SJoerg Sonnenberger */
144448d201a5SJoerg Sonnenberger LINENUM
pch_hunk_beg(void)144548d201a5SJoerg Sonnenberger pch_hunk_beg(void)
144648d201a5SJoerg Sonnenberger {
144748d201a5SJoerg Sonnenberger return p_hunk_beg;
144848d201a5SJoerg Sonnenberger }
144948d201a5SJoerg Sonnenberger
145048d201a5SJoerg Sonnenberger /*
145148d201a5SJoerg Sonnenberger * Apply an ed script by feeding ed itself.
145248d201a5SJoerg Sonnenberger */
145348d201a5SJoerg Sonnenberger void
do_ed_script(void)145448d201a5SJoerg Sonnenberger do_ed_script(void)
145548d201a5SJoerg Sonnenberger {
145648d201a5SJoerg Sonnenberger char *t;
1457*b94b84caSDaniel Fojt off_t beginning_of_this_line;
14589d62a0f9SSascha Wildner FILE *pipefp = NULL;
1459e4bdac6bSMatthew Dillon int continuation;
146048d201a5SJoerg Sonnenberger
146148d201a5SJoerg Sonnenberger if (!skip_rest_of_patch) {
146248d201a5SJoerg Sonnenberger if (copy_file(filearg[0], TMPOUTNAME) < 0) {
146348d201a5SJoerg Sonnenberger unlink(TMPOUTNAME);
146448d201a5SJoerg Sonnenberger fatal("can't create temp file %s", TMPOUTNAME);
146548d201a5SJoerg Sonnenberger }
1466e4bdac6bSMatthew Dillon snprintf(buf, buf_size, "%s%s%s", _PATH_RED,
146748d201a5SJoerg Sonnenberger verbose ? " " : " -s ", TMPOUTNAME);
146848d201a5SJoerg Sonnenberger pipefp = popen(buf, "w");
146948d201a5SJoerg Sonnenberger }
147048d201a5SJoerg Sonnenberger for (;;) {
1471*b94b84caSDaniel Fojt beginning_of_this_line = ftello(pfp);
14725027f2b8SJohn Marino if (pgets(true) == 0) {
147348d201a5SJoerg Sonnenberger next_intuit_at(beginning_of_this_line, p_input_line);
147448d201a5SJoerg Sonnenberger break;
147548d201a5SJoerg Sonnenberger }
147648d201a5SJoerg Sonnenberger p_input_line++;
147741871674SJoerg Sonnenberger for (t = buf; isdigit((unsigned char)*t) || *t == ','; t++)
147848d201a5SJoerg Sonnenberger ;
147948d201a5SJoerg Sonnenberger /* POSIX defines allowed commands as {a,c,d,i,s} */
1480*b94b84caSDaniel Fojt if (isdigit((unsigned char)*buf) &&
1481*b94b84caSDaniel Fojt (*t == 'a' || *t == 'c' || *t == 'd' || *t == 'i' || *t == 's')) {
148248d201a5SJoerg Sonnenberger if (pipefp != NULL)
148348d201a5SJoerg Sonnenberger fputs(buf, pipefp);
1484e4bdac6bSMatthew Dillon if (*t == 's') {
1485e4bdac6bSMatthew Dillon for (;;) {
1486e4bdac6bSMatthew Dillon continuation = 0;
1487e4bdac6bSMatthew Dillon t = strchr(buf, '\0') - 1;
1488e4bdac6bSMatthew Dillon while (--t >= buf && *t == '\\')
1489e4bdac6bSMatthew Dillon continuation = !continuation;
1490*b94b84caSDaniel Fojt if (!continuation ||
1491*b94b84caSDaniel Fojt pgets(true) == 0)
1492e4bdac6bSMatthew Dillon break;
1493e4bdac6bSMatthew Dillon if (pipefp != NULL)
1494e4bdac6bSMatthew Dillon fputs(buf, pipefp);
1495e4bdac6bSMatthew Dillon }
1496e4bdac6bSMatthew Dillon } else if (*t != 'd') {
14975027f2b8SJohn Marino while (pgets(true)) {
149848d201a5SJoerg Sonnenberger p_input_line++;
149948d201a5SJoerg Sonnenberger if (pipefp != NULL)
150048d201a5SJoerg Sonnenberger fputs(buf, pipefp);
150148d201a5SJoerg Sonnenberger if (strEQ(buf, ".\n"))
150248d201a5SJoerg Sonnenberger break;
150348d201a5SJoerg Sonnenberger }
150448d201a5SJoerg Sonnenberger }
150548d201a5SJoerg Sonnenberger } else {
150648d201a5SJoerg Sonnenberger next_intuit_at(beginning_of_this_line, p_input_line);
150748d201a5SJoerg Sonnenberger break;
150848d201a5SJoerg Sonnenberger }
150948d201a5SJoerg Sonnenberger }
151048d201a5SJoerg Sonnenberger if (pipefp == NULL)
151148d201a5SJoerg Sonnenberger return;
151248d201a5SJoerg Sonnenberger fprintf(pipefp, "w\n");
151348d201a5SJoerg Sonnenberger fprintf(pipefp, "q\n");
151448d201a5SJoerg Sonnenberger fflush(pipefp);
151548d201a5SJoerg Sonnenberger pclose(pipefp);
151648d201a5SJoerg Sonnenberger ignore_signals();
151748d201a5SJoerg Sonnenberger if (!check_only) {
151848d201a5SJoerg Sonnenberger if (move_file(TMPOUTNAME, outname) < 0) {
151948d201a5SJoerg Sonnenberger toutkeep = true;
152048d201a5SJoerg Sonnenberger chmod(TMPOUTNAME, filemode);
152148d201a5SJoerg Sonnenberger } else
152248d201a5SJoerg Sonnenberger chmod(outname, filemode);
152348d201a5SJoerg Sonnenberger }
152448d201a5SJoerg Sonnenberger set_signals(1);
152548d201a5SJoerg Sonnenberger }
152648d201a5SJoerg Sonnenberger
152748d201a5SJoerg Sonnenberger /*
152848d201a5SJoerg Sonnenberger * Choose the name of the file to be patched based on POSIX rules.
152948d201a5SJoerg Sonnenberger * NOTE: the POSIX rules are amazingly stupid and we only follow them
153048d201a5SJoerg Sonnenberger * if the user specified --posix or set POSIXLY_CORRECT.
153148d201a5SJoerg Sonnenberger */
153248d201a5SJoerg Sonnenberger static char *
posix_name(const struct file_name * names,bool assume_exists)153348d201a5SJoerg Sonnenberger posix_name(const struct file_name *names, bool assume_exists)
153448d201a5SJoerg Sonnenberger {
153548d201a5SJoerg Sonnenberger char *path = NULL;
153648d201a5SJoerg Sonnenberger int i;
153748d201a5SJoerg Sonnenberger
153848d201a5SJoerg Sonnenberger /*
153948d201a5SJoerg Sonnenberger * POSIX states that the filename will be chosen from one
154048d201a5SJoerg Sonnenberger * of the old, new and index names (in that order) if
154148d201a5SJoerg Sonnenberger * the file exists relative to CWD after -p stripping.
154248d201a5SJoerg Sonnenberger */
154348d201a5SJoerg Sonnenberger for (i = 0; i < MAX_FILE; i++) {
154448d201a5SJoerg Sonnenberger if (names[i].path != NULL && names[i].exists) {
154548d201a5SJoerg Sonnenberger path = names[i].path;
154648d201a5SJoerg Sonnenberger break;
154748d201a5SJoerg Sonnenberger }
154848d201a5SJoerg Sonnenberger }
154948d201a5SJoerg Sonnenberger if (path == NULL && !assume_exists) {
155048d201a5SJoerg Sonnenberger /*
1551*b94b84caSDaniel Fojt * No files found, check to see if the diff could be
1552*b94b84caSDaniel Fojt * creating a new file.
155348d201a5SJoerg Sonnenberger */
155448d201a5SJoerg Sonnenberger if (path == NULL && ok_to_create_file &&
155548d201a5SJoerg Sonnenberger names[NEW_FILE].path != NULL)
155648d201a5SJoerg Sonnenberger path = names[NEW_FILE].path;
155748d201a5SJoerg Sonnenberger }
155848d201a5SJoerg Sonnenberger
1559*b94b84caSDaniel Fojt return path ? xstrdup(path) : NULL;
156048d201a5SJoerg Sonnenberger }
156148d201a5SJoerg Sonnenberger
156248d201a5SJoerg Sonnenberger static char *
compare_names(const struct file_name * names,bool assume_exists)1563*b94b84caSDaniel Fojt compare_names(const struct file_name *names, bool assume_exists)
156448d201a5SJoerg Sonnenberger {
156548d201a5SJoerg Sonnenberger size_t min_components, min_baselen, min_len, tmp;
156648d201a5SJoerg Sonnenberger char *best = NULL;
15675027f2b8SJohn Marino char *path;
156848d201a5SJoerg Sonnenberger int i;
156948d201a5SJoerg Sonnenberger
157048d201a5SJoerg Sonnenberger /*
157148d201a5SJoerg Sonnenberger * The "best" name is the one with the fewest number of path
157248d201a5SJoerg Sonnenberger * components, the shortest basename length, and the shortest
157348d201a5SJoerg Sonnenberger * overall length (in that order). We only use the Index: file
157448d201a5SJoerg Sonnenberger * if neither of the old or new files could be intuited from
157548d201a5SJoerg Sonnenberger * the diff header.
157648d201a5SJoerg Sonnenberger */
157748d201a5SJoerg Sonnenberger min_components = min_baselen = min_len = SIZE_MAX;
157848d201a5SJoerg Sonnenberger for (i = INDEX_FILE; i >= OLD_FILE; i--) {
15795027f2b8SJohn Marino path = names[i].path;
1580*b94b84caSDaniel Fojt if (path == NULL || (!names[i].exists && !assume_exists))
158148d201a5SJoerg Sonnenberger continue;
15825027f2b8SJohn Marino if ((tmp = num_components(path)) > min_components)
158348d201a5SJoerg Sonnenberger continue;
15845027f2b8SJohn Marino if (tmp < min_components) {
158548d201a5SJoerg Sonnenberger min_components = tmp;
15865027f2b8SJohn Marino best = path;
15875027f2b8SJohn Marino }
15885027f2b8SJohn Marino if ((tmp = strlen(basename(path))) > min_baselen)
158948d201a5SJoerg Sonnenberger continue;
15905027f2b8SJohn Marino if (tmp < min_baselen) {
159148d201a5SJoerg Sonnenberger min_baselen = tmp;
15925027f2b8SJohn Marino best = path;
15935027f2b8SJohn Marino }
15945027f2b8SJohn Marino if ((tmp = strlen(path)) > min_len)
159548d201a5SJoerg Sonnenberger continue;
159648d201a5SJoerg Sonnenberger min_len = tmp;
15975027f2b8SJohn Marino best = path;
159848d201a5SJoerg Sonnenberger }
15995027f2b8SJohn Marino return best;
16005027f2b8SJohn Marino }
16015027f2b8SJohn Marino
160248d201a5SJoerg Sonnenberger /*
16035027f2b8SJohn Marino * Choose the name of the file to be patched based the "best" one
16045027f2b8SJohn Marino * available.
160548d201a5SJoerg Sonnenberger */
16065027f2b8SJohn Marino static char *
best_name(const struct file_name * names,bool assume_exists)16075027f2b8SJohn Marino best_name(const struct file_name *names, bool assume_exists)
16085027f2b8SJohn Marino {
16095027f2b8SJohn Marino char *best;
16105027f2b8SJohn Marino
1611*b94b84caSDaniel Fojt best = compare_names(names, assume_exists);
161248d201a5SJoerg Sonnenberger
1613*b94b84caSDaniel Fojt /* No match? Check to see if the diff could be creating a new file. */
1614*b94b84caSDaniel Fojt if (best == NULL && ok_to_create_file)
1615*b94b84caSDaniel Fojt best = names[NEW_FILE].path;
1616*b94b84caSDaniel Fojt
1617*b94b84caSDaniel Fojt return best ? xstrdup(best) : NULL;
161848d201a5SJoerg Sonnenberger }
161948d201a5SJoerg Sonnenberger
162048d201a5SJoerg Sonnenberger static size_t
num_components(const char * path)162148d201a5SJoerg Sonnenberger num_components(const char *path)
162248d201a5SJoerg Sonnenberger {
162348d201a5SJoerg Sonnenberger size_t n;
162448d201a5SJoerg Sonnenberger const char *cp;
162548d201a5SJoerg Sonnenberger
162648d201a5SJoerg Sonnenberger for (n = 0, cp = path; (cp = strchr(cp, '/')) != NULL; n++, cp++) {
162748d201a5SJoerg Sonnenberger while (*cp == '/')
162848d201a5SJoerg Sonnenberger cp++; /* skip consecutive slashes */
162948d201a5SJoerg Sonnenberger }
163048d201a5SJoerg Sonnenberger return n;
163148d201a5SJoerg Sonnenberger }
1632*b94b84caSDaniel Fojt
1633*b94b84caSDaniel Fojt /*
1634*b94b84caSDaniel Fojt * Convert number at NPTR into LINENUM and save address of first
1635*b94b84caSDaniel Fojt * character that is not a digit in ENDPTR. If conversion is not
1636*b94b84caSDaniel Fojt * possible, call fatal.
1637*b94b84caSDaniel Fojt */
1638*b94b84caSDaniel Fojt static LINENUM
strtolinenum(char * nptr,char ** endptr)1639*b94b84caSDaniel Fojt strtolinenum(char *nptr, char **endptr)
1640*b94b84caSDaniel Fojt {
1641*b94b84caSDaniel Fojt LINENUM rv;
1642*b94b84caSDaniel Fojt char c;
1643*b94b84caSDaniel Fojt char *p;
1644*b94b84caSDaniel Fojt const char *errstr;
1645*b94b84caSDaniel Fojt
1646*b94b84caSDaniel Fojt for (p = nptr; isdigit((unsigned char)*p); p++)
1647*b94b84caSDaniel Fojt ;
1648*b94b84caSDaniel Fojt
1649*b94b84caSDaniel Fojt if (p == nptr)
1650*b94b84caSDaniel Fojt malformed();
1651*b94b84caSDaniel Fojt
1652*b94b84caSDaniel Fojt c = *p;
1653*b94b84caSDaniel Fojt *p = '\0';
1654*b94b84caSDaniel Fojt
1655*b94b84caSDaniel Fojt rv = strtonum(nptr, 0, LINENUM_MAX, &errstr);
1656*b94b84caSDaniel Fojt if (errstr != NULL)
1657*b94b84caSDaniel Fojt fatal("invalid line number at line %ld: `%s' is %s\n",
1658*b94b84caSDaniel Fojt p_input_line, nptr, errstr);
1659*b94b84caSDaniel Fojt
1660*b94b84caSDaniel Fojt *p = c;
1661*b94b84caSDaniel Fojt *endptr = p;
1662*b94b84caSDaniel Fojt
1663*b94b84caSDaniel Fojt return rv;
1664*b94b84caSDaniel Fojt }
1665