patch.c revision 1.17 1 1.17 kristerw /* $NetBSD: patch.c,v 1.17 2003/05/30 23:08:13 kristerw Exp $ */
2 1.4 thorpej
3 1.1 cgd /* patch - a program to apply diffs to original files
4 1.1 cgd *
5 1.1 cgd * Copyright 1986, Larry Wall
6 1.1 cgd *
7 1.9 ragge * Redistribution and use in source and binary forms, with or without
8 1.9 ragge * modification, are permitted provided that the following condition
9 1.9 ragge * is met:
10 1.9 ragge * 1. Redistributions of source code must retain the above copyright
11 1.9 ragge * notice, this condition and the following disclaimer.
12 1.9 ragge *
13 1.9 ragge * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
14 1.9 ragge * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 1.9 ragge * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16 1.9 ragge * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
17 1.9 ragge * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 1.9 ragge * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
19 1.9 ragge * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 1.9 ragge * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 1.9 ragge * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 1.9 ragge * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 1.9 ragge * SUCH DAMAGE.
24 1.1 cgd */
25 1.2 mycroft
26 1.6 christos #include <sys/cdefs.h>
27 1.2 mycroft #ifndef lint
28 1.17 kristerw __RCSID("$NetBSD: patch.c,v 1.17 2003/05/30 23:08:13 kristerw Exp $");
29 1.2 mycroft #endif /* not lint */
30 1.1 cgd
31 1.1 cgd #include "INTERN.h"
32 1.1 cgd #include "common.h"
33 1.1 cgd #include "EXTERN.h"
34 1.1 cgd #include "version.h"
35 1.1 cgd #include "util.h"
36 1.1 cgd #include "pch.h"
37 1.1 cgd #include "inp.h"
38 1.1 cgd #include "backupfile.h"
39 1.1 cgd
40 1.3 thorpej #include <stdlib.h>
41 1.6 christos #include <unistd.h>
42 1.6 christos
43 1.1 cgd /* procedures */
44 1.10 kristerw static void reinitialize_almost_everything(void);
45 1.10 kristerw static char *nextarg(void);
46 1.10 kristerw static int optcmp(const void *, const void *);
47 1.10 kristerw static char decode_long_option(char *);
48 1.10 kristerw static void get_some_switches(void);
49 1.10 kristerw static LINENUM locate_hunk(LINENUM);
50 1.10 kristerw static void abort_hunk(void);
51 1.10 kristerw static void apply_hunk(LINENUM);
52 1.10 kristerw static void init_output(char *);
53 1.10 kristerw static void init_reject(char *);
54 1.10 kristerw static void copy_till(LINENUM);
55 1.10 kristerw static void spew_output(void);
56 1.10 kristerw static void dump_line(LINENUM);
57 1.10 kristerw static bool patch_match(LINENUM, LINENUM, LINENUM);
58 1.17 kristerw static bool similar(char *, char *, size_t);
59 1.10 kristerw int main(int, char *[]);
60 1.1 cgd
61 1.1 cgd /* TRUE if -E was specified on command line. */
62 1.1 cgd static int remove_empty_files = FALSE;
63 1.1 cgd
64 1.1 cgd /* TRUE if -R was specified on command line. */
65 1.1 cgd static int reverse_flag_specified = FALSE;
66 1.1 cgd
67 1.1 cgd /* Apply a set of diffs as appropriate. */
68 1.1 cgd
69 1.1 cgd int
70 1.10 kristerw main(int argc, char *argv[])
71 1.1 cgd {
72 1.6 christos LINENUM where = 0;
73 1.1 cgd LINENUM newwhere;
74 1.1 cgd LINENUM fuzz;
75 1.1 cgd LINENUM mymaxfuzz;
76 1.1 cgd int hunk = 0;
77 1.1 cgd int failed = 0;
78 1.1 cgd int failtotal = 0;
79 1.1 cgd int i;
80 1.1 cgd
81 1.1 cgd for (i = 0; i<MAXFILEC; i++)
82 1.11 kristerw filearg[i] = NULL;
83 1.1 cgd
84 1.1 cgd myuid = getuid();
85 1.1 cgd
86 1.1 cgd /* Cons up the names of the temporary files. */
87 1.1 cgd {
88 1.1 cgd /* Directory for temporary files. */
89 1.1 cgd char *tmpdir;
90 1.11 kristerw size_t tmpname_len;
91 1.1 cgd
92 1.1 cgd tmpdir = getenv ("TMPDIR");
93 1.1 cgd if (tmpdir == NULL) {
94 1.1 cgd tmpdir = "/tmp";
95 1.1 cgd }
96 1.1 cgd tmpname_len = strlen (tmpdir) + 20;
97 1.1 cgd
98 1.12 kristerw TMPOUTNAME = xmalloc(tmpname_len);
99 1.1 cgd strcpy (TMPOUTNAME, tmpdir);
100 1.1 cgd strcat (TMPOUTNAME, "/patchoXXXXXX");
101 1.5 lukem if ((i = mkstemp(TMPOUTNAME)) < 0)
102 1.11 kristerw pfatal("can't create %s", TMPOUTNAME);
103 1.5 lukem Close(i);
104 1.1 cgd
105 1.12 kristerw TMPINNAME = xmalloc(tmpname_len);
106 1.1 cgd strcpy (TMPINNAME, tmpdir);
107 1.1 cgd strcat (TMPINNAME, "/patchiXXXXXX");
108 1.5 lukem if ((i = mkstemp(TMPINNAME)) < 0)
109 1.11 kristerw pfatal("can't create %s", TMPINNAME);
110 1.5 lukem Close(i);
111 1.1 cgd
112 1.12 kristerw TMPREJNAME = xmalloc(tmpname_len);
113 1.1 cgd strcpy (TMPREJNAME, tmpdir);
114 1.1 cgd strcat (TMPREJNAME, "/patchrXXXXXX");
115 1.5 lukem if ((i = mkstemp(TMPREJNAME)) < 0)
116 1.11 kristerw pfatal("can't create %s", TMPREJNAME);
117 1.5 lukem Close(i);
118 1.1 cgd
119 1.12 kristerw TMPPATNAME = xmalloc(tmpname_len);
120 1.1 cgd strcpy (TMPPATNAME, tmpdir);
121 1.1 cgd strcat (TMPPATNAME, "/patchpXXXXXX");
122 1.5 lukem if ((i = mkstemp(TMPPATNAME)) < 0)
123 1.11 kristerw pfatal("can't create %s", TMPPATNAME);
124 1.5 lukem Close(i);
125 1.1 cgd }
126 1.1 cgd
127 1.1 cgd {
128 1.1 cgd char *v;
129 1.1 cgd
130 1.1 cgd v = getenv ("SIMPLE_BACKUP_SUFFIX");
131 1.1 cgd if (v)
132 1.1 cgd simple_backup_suffix = v;
133 1.1 cgd else
134 1.1 cgd simple_backup_suffix = ORIGEXT;
135 1.1 cgd #ifndef NODIR
136 1.1 cgd v = getenv ("VERSION_CONTROL");
137 1.1 cgd backup_type = get_version (v); /* OK to pass NULL. */
138 1.1 cgd #endif
139 1.1 cgd }
140 1.1 cgd
141 1.1 cgd /* parse switches */
142 1.1 cgd Argc = argc;
143 1.1 cgd Argv = argv;
144 1.1 cgd get_some_switches();
145 1.1 cgd
146 1.1 cgd /* make sure we clean up /tmp in case of disaster */
147 1.1 cgd set_signals(0);
148 1.1 cgd
149 1.1 cgd for (
150 1.1 cgd open_patch_file(filearg[1]);
151 1.1 cgd there_is_another_patch();
152 1.1 cgd reinitialize_almost_everything()
153 1.1 cgd ) { /* for each patch in patch file */
154 1.1 cgd
155 1.13 kristerw if (!skip_rest_of_patch && outname == NULL)
156 1.12 kristerw outname = xstrdup(filearg[0]);
157 1.1 cgd
158 1.1 cgd /* for ed script just up and do it and exit */
159 1.1 cgd if (diff_type == ED_DIFF) {
160 1.1 cgd do_ed_script();
161 1.1 cgd continue;
162 1.1 cgd }
163 1.1 cgd
164 1.1 cgd /* initialize the patched file */
165 1.1 cgd if (!skip_rest_of_patch)
166 1.1 cgd init_output(TMPOUTNAME);
167 1.1 cgd
168 1.1 cgd /* initialize reject file */
169 1.1 cgd init_reject(TMPREJNAME);
170 1.1 cgd
171 1.1 cgd /* find out where all the lines are */
172 1.1 cgd if (!skip_rest_of_patch)
173 1.1 cgd scan_input(filearg[0]);
174 1.1 cgd
175 1.1 cgd /* from here on, open no standard i/o files, because malloc */
176 1.1 cgd /* might misfire and we can't catch it easily */
177 1.1 cgd
178 1.1 cgd /* apply each hunk of patch */
179 1.1 cgd hunk = 0;
180 1.1 cgd failed = 0;
181 1.1 cgd while (another_hunk()) {
182 1.1 cgd hunk++;
183 1.1 cgd fuzz = Nulline;
184 1.1 cgd mymaxfuzz = pch_context();
185 1.1 cgd if (maxfuzz < mymaxfuzz)
186 1.1 cgd mymaxfuzz = maxfuzz;
187 1.1 cgd if (!skip_rest_of_patch) {
188 1.1 cgd do {
189 1.1 cgd where = locate_hunk(fuzz);
190 1.1 cgd if (hunk == 1 && where == Nulline && !force) {
191 1.1 cgd /* dwim for reversed patch? */
192 1.1 cgd if (!pch_swap()) {
193 1.1 cgd if (fuzz == Nulline)
194 1.11 kristerw say(
195 1.1 cgd "Not enough memory to try swapped hunk! Assuming unswapped.\n");
196 1.1 cgd continue;
197 1.1 cgd }
198 1.1 cgd reverse = !reverse;
199 1.1 cgd where = locate_hunk(fuzz); /* try again */
200 1.1 cgd if (where == Nulline) { /* didn't find it swapped */
201 1.1 cgd if (!pch_swap()) /* put it back to normal */
202 1.11 kristerw fatal("lost hunk on alloc error!\n");
203 1.1 cgd reverse = !reverse;
204 1.1 cgd }
205 1.1 cgd else if (noreverse) {
206 1.1 cgd if (!pch_swap()) /* put it back to normal */
207 1.11 kristerw fatal("lost hunk on alloc error!\n");
208 1.1 cgd reverse = !reverse;
209 1.11 kristerw say(
210 1.1 cgd "Ignoring previously applied (or reversed) patch.\n");
211 1.1 cgd skip_rest_of_patch = TRUE;
212 1.1 cgd }
213 1.1 cgd else if (batch) {
214 1.1 cgd if (verbose)
215 1.11 kristerw say(
216 1.1 cgd "%seversed (or previously applied) patch detected! %s -R.",
217 1.1 cgd reverse ? "R" : "Unr",
218 1.1 cgd reverse ? "Assuming" : "Ignoring");
219 1.1 cgd }
220 1.1 cgd else {
221 1.11 kristerw ask(
222 1.1 cgd "%seversed (or previously applied) patch detected! %s -R? [y] ",
223 1.1 cgd reverse ? "R" : "Unr",
224 1.1 cgd reverse ? "Assume" : "Ignore");
225 1.1 cgd if (*buf == 'n') {
226 1.11 kristerw ask("Apply anyway? [n] ");
227 1.1 cgd if (*buf != 'y')
228 1.1 cgd skip_rest_of_patch = TRUE;
229 1.1 cgd where = Nulline;
230 1.1 cgd reverse = !reverse;
231 1.1 cgd if (!pch_swap()) /* put it back to normal */
232 1.11 kristerw fatal("lost hunk on alloc error!\n");
233 1.1 cgd }
234 1.1 cgd }
235 1.1 cgd }
236 1.1 cgd } while (!skip_rest_of_patch && where == Nulline &&
237 1.1 cgd ++fuzz <= mymaxfuzz);
238 1.1 cgd
239 1.1 cgd if (skip_rest_of_patch) { /* just got decided */
240 1.1 cgd Fclose(ofp);
241 1.11 kristerw ofp = NULL;
242 1.1 cgd }
243 1.1 cgd }
244 1.1 cgd
245 1.1 cgd newwhere = pch_newfirst() + last_offset;
246 1.1 cgd if (skip_rest_of_patch) {
247 1.1 cgd abort_hunk();
248 1.1 cgd failed++;
249 1.1 cgd if (verbose)
250 1.14 kristerw say("Hunk #%d ignored at %d.\n", hunk, newwhere);
251 1.1 cgd }
252 1.1 cgd else if (where == Nulline) {
253 1.1 cgd abort_hunk();
254 1.1 cgd failed++;
255 1.1 cgd if (verbose)
256 1.14 kristerw say("Hunk #%d failed at %d.\n", hunk, newwhere);
257 1.1 cgd }
258 1.1 cgd else {
259 1.1 cgd apply_hunk(where);
260 1.1 cgd if (verbose) {
261 1.14 kristerw say("Hunk #%d succeeded at %d", hunk, newwhere);
262 1.1 cgd if (fuzz)
263 1.14 kristerw say(" with fuzz %d", fuzz);
264 1.1 cgd if (last_offset)
265 1.14 kristerw say(" (offset %d line%s)",
266 1.14 kristerw last_offset, last_offset==1?"":"s");
267 1.11 kristerw say(".\n");
268 1.1 cgd }
269 1.1 cgd }
270 1.1 cgd }
271 1.1 cgd
272 1.1 cgd assert(hunk);
273 1.1 cgd
274 1.1 cgd /* finish spewing out the new file */
275 1.1 cgd if (!skip_rest_of_patch)
276 1.1 cgd spew_output();
277 1.1 cgd
278 1.1 cgd /* and put the output where desired */
279 1.1 cgd ignore_signals();
280 1.1 cgd if (!skip_rest_of_patch) {
281 1.1 cgd struct stat statbuf;
282 1.1 cgd char *realout = outname;
283 1.1 cgd
284 1.1 cgd if (move_file(TMPOUTNAME, outname) < 0) {
285 1.1 cgd toutkeep = TRUE;
286 1.1 cgd realout = TMPOUTNAME;
287 1.1 cgd chmod(TMPOUTNAME, filemode);
288 1.1 cgd }
289 1.1 cgd else
290 1.1 cgd chmod(outname, filemode);
291 1.1 cgd
292 1.1 cgd if (remove_empty_files && stat(realout, &statbuf) == 0
293 1.1 cgd && statbuf.st_size == 0) {
294 1.1 cgd if (verbose)
295 1.11 kristerw say("Removing %s (empty after patching).\n", realout);
296 1.1 cgd while (unlink(realout) >= 0) ; /* while is for Eunice. */
297 1.1 cgd }
298 1.1 cgd }
299 1.1 cgd Fclose(rejfp);
300 1.11 kristerw rejfp = NULL;
301 1.1 cgd if (failed) {
302 1.1 cgd failtotal += failed;
303 1.13 kristerw if (outname != NULL) {
304 1.13 kristerw if (!*rejname) {
305 1.13 kristerw Strcpy(rejname, outname);
306 1.13 kristerw Strcat(rejname, REJEXT);
307 1.13 kristerw }
308 1.13 kristerw if (skip_rest_of_patch)
309 1.13 kristerw say("%d out of %d hunks ignored"
310 1.13 kristerw "--saving rejects to %s\n",
311 1.13 kristerw failed, hunk, rejname);
312 1.13 kristerw else
313 1.13 kristerw say("%d out of %d hunks failed"
314 1.13 kristerw "--saving rejects to %s\n",
315 1.13 kristerw failed, hunk, rejname);
316 1.13 kristerw if (move_file(TMPREJNAME, rejname) < 0)
317 1.13 kristerw trejkeep = TRUE;
318 1.13 kristerw } else
319 1.13 kristerw say("%d out of %d hunks ignored\n", failed, hunk);
320 1.1 cgd }
321 1.1 cgd set_signals(1);
322 1.1 cgd }
323 1.1 cgd my_exit(failtotal);
324 1.17 kristerw /* NOTREACHED */
325 1.1 cgd }
326 1.1 cgd
327 1.1 cgd /* Prepare to find the next patch to do in the patch file. */
328 1.1 cgd
329 1.6 christos static void
330 1.10 kristerw reinitialize_almost_everything(void)
331 1.1 cgd {
332 1.1 cgd re_patch();
333 1.1 cgd re_input();
334 1.1 cgd
335 1.1 cgd input_lines = 0;
336 1.1 cgd last_frozen_line = 0;
337 1.1 cgd
338 1.1 cgd filec = 0;
339 1.15 kristerw if (filearg[0] != NULL) {
340 1.1 cgd free(filearg[0]);
341 1.11 kristerw filearg[0] = NULL;
342 1.1 cgd }
343 1.1 cgd
344 1.11 kristerw if (outname != NULL) {
345 1.1 cgd free(outname);
346 1.11 kristerw outname = NULL;
347 1.1 cgd }
348 1.1 cgd
349 1.1 cgd last_offset = 0;
350 1.1 cgd
351 1.1 cgd diff_type = 0;
352 1.1 cgd
353 1.11 kristerw if (revision != NULL) {
354 1.1 cgd free(revision);
355 1.11 kristerw revision = NULL;
356 1.1 cgd }
357 1.1 cgd
358 1.1 cgd reverse = reverse_flag_specified;
359 1.1 cgd skip_rest_of_patch = FALSE;
360 1.1 cgd
361 1.1 cgd get_some_switches();
362 1.1 cgd
363 1.1 cgd if (filec >= 2)
364 1.11 kristerw fatal("you may not change to a different patch file\n");
365 1.1 cgd }
366 1.1 cgd
367 1.1 cgd static char *
368 1.10 kristerw nextarg(void)
369 1.1 cgd {
370 1.1 cgd if (!--Argc)
371 1.11 kristerw fatal("missing argument after `%s'\n", *Argv);
372 1.1 cgd return *++Argv;
373 1.1 cgd }
374 1.1 cgd
375 1.3 thorpej /* Module for handling of long options. */
376 1.3 thorpej
377 1.3 thorpej struct option {
378 1.3 thorpej char *long_opt;
379 1.3 thorpej char short_opt;
380 1.3 thorpej };
381 1.3 thorpej
382 1.6 christos static int
383 1.10 kristerw optcmp(const void *va, const void *vb)
384 1.3 thorpej {
385 1.6 christos const struct option *a = va, *b = vb;
386 1.3 thorpej return strcmp (a->long_opt, b->long_opt);
387 1.3 thorpej }
388 1.3 thorpej
389 1.3 thorpej /* Decode Long options beginning with "--" to their short equivalents. */
390 1.3 thorpej
391 1.6 christos static char
392 1.10 kristerw decode_long_option(char *opt)
393 1.3 thorpej {
394 1.3 thorpej /*
395 1.3 thorpej * This table must be sorted on the first field. We also decode
396 1.3 thorpej * unimplemented options as those will probably be dealt with
397 1.3 thorpej * later, anyhow.
398 1.3 thorpej */
399 1.3 thorpej static struct option options[] = {
400 1.3 thorpej { "batch", 't' },
401 1.3 thorpej { "check", 'C' },
402 1.3 thorpej { "context", 'c' },
403 1.3 thorpej { "debug", 'x' },
404 1.3 thorpej { "directory", 'd' },
405 1.3 thorpej { "ed", 'e' },
406 1.3 thorpej { "force", 'f' },
407 1.3 thorpej { "forward", 'N' },
408 1.3 thorpej { "fuzz", 'F' },
409 1.3 thorpej { "ifdef", 'D' },
410 1.3 thorpej { "ignore-whitespace", 'l' },
411 1.3 thorpej { "normal", 'n' },
412 1.3 thorpej { "output", 'o' },
413 1.8 kleink { "patchfile", 'i' },
414 1.3 thorpej { "prefix", 'B' },
415 1.3 thorpej { "quiet", 's' },
416 1.3 thorpej { "reject-file", 'r' },
417 1.3 thorpej { "remove-empty-files", 'E' },
418 1.3 thorpej { "reverse", 'R' },
419 1.3 thorpej { "silent", 's' },
420 1.3 thorpej { "skip", 'S' },
421 1.3 thorpej { "strip", 'p' },
422 1.3 thorpej { "suffix", 'b' },
423 1.3 thorpej { "unified", 'u' },
424 1.3 thorpej { "version", 'v' },
425 1.3 thorpej { "version-control", 'V' },
426 1.3 thorpej };
427 1.3 thorpej struct option key, *found;
428 1.3 thorpej
429 1.3 thorpej key.long_opt = opt;
430 1.11 kristerw found = bsearch(&key, options,
431 1.3 thorpej sizeof(options) / sizeof(options[0]), sizeof(options[0]), optcmp);
432 1.3 thorpej
433 1.3 thorpej return found ? found->short_opt : '\0';
434 1.3 thorpej }
435 1.3 thorpej
436 1.1 cgd /* Process switches and filenames up to next '+' or end of list. */
437 1.1 cgd
438 1.6 christos static void
439 1.10 kristerw get_some_switches(void)
440 1.1 cgd {
441 1.10 kristerw char *s;
442 1.1 cgd
443 1.1 cgd rejname[0] = '\0';
444 1.1 cgd if (!Argc)
445 1.1 cgd return;
446 1.1 cgd for (Argc--,Argv++; Argc; Argc--,Argv++) {
447 1.1 cgd s = Argv[0];
448 1.1 cgd if (strEQ(s, "+")) {
449 1.1 cgd return; /* + will be skipped by for loop */
450 1.1 cgd }
451 1.1 cgd if (*s != '-' || !s[1]) {
452 1.1 cgd if (filec == MAXFILEC)
453 1.11 kristerw fatal("too many file arguments\n");
454 1.11 kristerw if (filec == 1 && filearg[filec] != NULL)
455 1.11 kristerw fatal("-i option and patchfile argument are mutually\
456 1.8 kleink exclusive\n");
457 1.12 kristerw filearg[filec++] = xstrdup(s);
458 1.1 cgd }
459 1.1 cgd else {
460 1.3 thorpej char opt;
461 1.3 thorpej
462 1.3 thorpej if (*(s + 1) == '-') {
463 1.3 thorpej opt = decode_long_option(s + 2);
464 1.3 thorpej s += strlen(s) - 1;
465 1.3 thorpej }
466 1.3 thorpej else
467 1.3 thorpej opt = *++s;
468 1.3 thorpej
469 1.3 thorpej switch (opt) {
470 1.1 cgd case 'b':
471 1.12 kristerw simple_backup_suffix = xstrdup(nextarg());
472 1.1 cgd break;
473 1.1 cgd case 'B':
474 1.12 kristerw origprae = xstrdup(nextarg());
475 1.1 cgd break;
476 1.1 cgd case 'c':
477 1.1 cgd diff_type = CONTEXT_DIFF;
478 1.1 cgd break;
479 1.1 cgd case 'd':
480 1.1 cgd if (!*++s)
481 1.1 cgd s = nextarg();
482 1.1 cgd if (chdir(s) < 0)
483 1.11 kristerw pfatal("can't cd to %s", s);
484 1.1 cgd break;
485 1.1 cgd case 'D':
486 1.1 cgd do_defines = TRUE;
487 1.1 cgd if (!*++s)
488 1.1 cgd s = nextarg();
489 1.7 christos if (!isalpha((unsigned char)*s) && '_' != *s)
490 1.11 kristerw fatal("argument to -D is not an identifier\n");
491 1.1 cgd Sprintf(if_defined, "#ifdef %s\n", s);
492 1.1 cgd Sprintf(not_defined, "#ifndef %s\n", s);
493 1.1 cgd Sprintf(end_defined, "#endif /* %s */\n", s);
494 1.1 cgd break;
495 1.1 cgd case 'e':
496 1.1 cgd diff_type = ED_DIFF;
497 1.1 cgd break;
498 1.1 cgd case 'E':
499 1.1 cgd remove_empty_files = TRUE;
500 1.1 cgd break;
501 1.1 cgd case 'f':
502 1.1 cgd force = TRUE;
503 1.1 cgd break;
504 1.1 cgd case 'F':
505 1.1 cgd if (*++s == '=')
506 1.1 cgd s++;
507 1.1 cgd maxfuzz = atoi(s);
508 1.8 kleink break;
509 1.8 kleink case 'i':
510 1.11 kristerw if (filearg[1] != NULL)
511 1.8 kleink free(filearg[1]);
512 1.12 kristerw filearg[1] = xstrdup(nextarg());
513 1.1 cgd break;
514 1.1 cgd case 'l':
515 1.1 cgd canonicalize = TRUE;
516 1.1 cgd break;
517 1.1 cgd case 'n':
518 1.1 cgd diff_type = NORMAL_DIFF;
519 1.1 cgd break;
520 1.1 cgd case 'N':
521 1.1 cgd noreverse = TRUE;
522 1.1 cgd break;
523 1.1 cgd case 'o':
524 1.12 kristerw outname = xstrdup(nextarg());
525 1.1 cgd break;
526 1.1 cgd case 'p':
527 1.1 cgd if (*++s == '=')
528 1.1 cgd s++;
529 1.1 cgd strippath = atoi(s);
530 1.1 cgd break;
531 1.1 cgd case 'r':
532 1.1 cgd Strcpy(rejname, nextarg());
533 1.1 cgd break;
534 1.1 cgd case 'R':
535 1.1 cgd reverse = TRUE;
536 1.1 cgd reverse_flag_specified = TRUE;
537 1.1 cgd break;
538 1.1 cgd case 's':
539 1.1 cgd verbose = FALSE;
540 1.1 cgd break;
541 1.1 cgd case 'S':
542 1.1 cgd skip_rest_of_patch = TRUE;
543 1.1 cgd break;
544 1.1 cgd case 't':
545 1.1 cgd batch = TRUE;
546 1.1 cgd break;
547 1.1 cgd case 'u':
548 1.1 cgd diff_type = UNI_DIFF;
549 1.1 cgd break;
550 1.1 cgd case 'v':
551 1.1 cgd version();
552 1.1 cgd break;
553 1.1 cgd case 'V':
554 1.1 cgd #ifndef NODIR
555 1.1 cgd backup_type = get_version (nextarg ());
556 1.1 cgd #endif
557 1.1 cgd break;
558 1.1 cgd #ifdef DEBUGGING
559 1.1 cgd case 'x':
560 1.1 cgd debug = atoi(s+1);
561 1.1 cgd break;
562 1.1 cgd #endif
563 1.1 cgd default:
564 1.1 cgd fprintf(stderr, "patch: unrecognized option `%s'\n", Argv[0]);
565 1.1 cgd fprintf(stderr, "\
566 1.1 cgd Usage: patch [options] [origfile [patchfile]] [+ [options] [origfile]]...\n\
567 1.1 cgd Options:\n\
568 1.1 cgd [-ceEflnNRsStuv] [-b backup-ext] [-B backup-prefix] [-d directory]\n\
569 1.1 cgd [-D symbol] [-Fmax-fuzz] [-o out-file] [-p[strip-count]]\n\
570 1.1 cgd [-r rej-name] [-V {numbered,existing,simple}]\n");
571 1.1 cgd my_exit(1);
572 1.1 cgd }
573 1.1 cgd }
574 1.1 cgd }
575 1.1 cgd }
576 1.1 cgd
577 1.1 cgd /* Attempt to find the right place to apply this hunk of patch. */
578 1.1 cgd
579 1.6 christos static LINENUM
580 1.10 kristerw locate_hunk(LINENUM fuzz)
581 1.1 cgd {
582 1.10 kristerw LINENUM first_guess = pch_first() + last_offset;
583 1.10 kristerw LINENUM offset;
584 1.1 cgd LINENUM pat_lines = pch_ptrn_lines();
585 1.10 kristerw LINENUM max_pos_offset = input_lines - first_guess
586 1.1 cgd - pat_lines + 1;
587 1.10 kristerw LINENUM max_neg_offset = first_guess - last_frozen_line - 1
588 1.1 cgd + pch_context();
589 1.1 cgd
590 1.1 cgd if (!pat_lines) /* null range matches always */
591 1.1 cgd return first_guess;
592 1.1 cgd if (max_neg_offset >= first_guess) /* do not try lines < 0 */
593 1.1 cgd max_neg_offset = first_guess - 1;
594 1.1 cgd if (first_guess <= input_lines && patch_match(first_guess, Nulline, fuzz))
595 1.1 cgd return first_guess;
596 1.1 cgd for (offset = 1; ; offset++) {
597 1.10 kristerw bool check_after = (offset <= max_pos_offset);
598 1.10 kristerw bool check_before = (offset <= max_neg_offset);
599 1.1 cgd
600 1.1 cgd if (check_after && patch_match(first_guess, offset, fuzz)) {
601 1.1 cgd #ifdef DEBUGGING
602 1.1 cgd if (debug & 1)
603 1.14 kristerw say("Offset changing from %d to %d\n", last_offset, offset);
604 1.1 cgd #endif
605 1.1 cgd last_offset = offset;
606 1.1 cgd return first_guess+offset;
607 1.1 cgd }
608 1.1 cgd else if (check_before && patch_match(first_guess, -offset, fuzz)) {
609 1.1 cgd #ifdef DEBUGGING
610 1.1 cgd if (debug & 1)
611 1.14 kristerw say("Offset changing from %d to %d\n", last_offset, -offset);
612 1.1 cgd #endif
613 1.1 cgd last_offset = -offset;
614 1.1 cgd return first_guess-offset;
615 1.1 cgd }
616 1.1 cgd else if (!check_before && !check_after)
617 1.1 cgd return Nulline;
618 1.1 cgd }
619 1.1 cgd }
620 1.1 cgd
621 1.1 cgd /* We did not find the pattern, dump out the hunk so they can handle it. */
622 1.1 cgd
623 1.6 christos static void
624 1.10 kristerw abort_hunk(void)
625 1.1 cgd {
626 1.10 kristerw LINENUM i;
627 1.10 kristerw LINENUM pat_end = pch_end();
628 1.1 cgd /* add in last_offset to guess the same as the previous successful hunk */
629 1.1 cgd LINENUM oldfirst = pch_first() + last_offset;
630 1.1 cgd LINENUM newfirst = pch_newfirst() + last_offset;
631 1.1 cgd LINENUM oldlast = oldfirst + pch_ptrn_lines() - 1;
632 1.1 cgd LINENUM newlast = newfirst + pch_repl_lines() - 1;
633 1.1 cgd char *stars = (diff_type >= NEW_CONTEXT_DIFF ? " ****" : "");
634 1.1 cgd char *minuses = (diff_type >= NEW_CONTEXT_DIFF ? " ----" : " -----");
635 1.1 cgd
636 1.1 cgd fprintf(rejfp, "***************\n");
637 1.1 cgd for (i=0; i<=pat_end; i++) {
638 1.1 cgd switch (pch_char(i)) {
639 1.1 cgd case '*':
640 1.1 cgd if (oldlast < oldfirst)
641 1.1 cgd fprintf(rejfp, "*** 0%s\n", stars);
642 1.1 cgd else if (oldlast == oldfirst)
643 1.14 kristerw fprintf(rejfp, "*** %d%s\n", oldfirst, stars);
644 1.1 cgd else
645 1.14 kristerw fprintf(rejfp, "*** %d,%d%s\n", oldfirst, oldlast, stars);
646 1.1 cgd break;
647 1.1 cgd case '=':
648 1.1 cgd if (newlast < newfirst)
649 1.1 cgd fprintf(rejfp, "--- 0%s\n", minuses);
650 1.1 cgd else if (newlast == newfirst)
651 1.14 kristerw fprintf(rejfp, "--- %d%s\n", newfirst, minuses);
652 1.1 cgd else
653 1.14 kristerw fprintf(rejfp, "--- %d,%d%s\n", newfirst, newlast, minuses);
654 1.1 cgd break;
655 1.1 cgd case '\n':
656 1.1 cgd fprintf(rejfp, "%s", pfetch(i));
657 1.1 cgd break;
658 1.1 cgd case ' ': case '-': case '+': case '!':
659 1.1 cgd fprintf(rejfp, "%c %s", pch_char(i), pfetch(i));
660 1.1 cgd break;
661 1.1 cgd default:
662 1.11 kristerw fatal("fatal internal error in abort_hunk\n");
663 1.1 cgd }
664 1.1 cgd }
665 1.1 cgd }
666 1.1 cgd
667 1.1 cgd /* We found where to apply it (we hope), so do it. */
668 1.1 cgd
669 1.6 christos static void
670 1.10 kristerw apply_hunk(LINENUM where)
671 1.1 cgd {
672 1.10 kristerw LINENUM old = 1;
673 1.10 kristerw LINENUM lastline = pch_ptrn_lines();
674 1.10 kristerw LINENUM new = lastline+1;
675 1.1 cgd #define OUTSIDE 0
676 1.1 cgd #define IN_IFNDEF 1
677 1.1 cgd #define IN_IFDEF 2
678 1.1 cgd #define IN_ELSE 3
679 1.10 kristerw int def_state = OUTSIDE;
680 1.10 kristerw bool R_do_defines = do_defines;
681 1.10 kristerw LINENUM pat_end = pch_end();
682 1.1 cgd
683 1.1 cgd where--;
684 1.1 cgd while (pch_char(new) == '=' || pch_char(new) == '\n')
685 1.1 cgd new++;
686 1.1 cgd
687 1.1 cgd while (old <= lastline) {
688 1.1 cgd if (pch_char(old) == '-') {
689 1.1 cgd copy_till(where + old - 1);
690 1.1 cgd if (R_do_defines) {
691 1.1 cgd if (def_state == OUTSIDE) {
692 1.1 cgd fputs(not_defined, ofp);
693 1.1 cgd def_state = IN_IFNDEF;
694 1.1 cgd }
695 1.1 cgd else if (def_state == IN_IFDEF) {
696 1.1 cgd fputs(else_defined, ofp);
697 1.1 cgd def_state = IN_ELSE;
698 1.1 cgd }
699 1.1 cgd fputs(pfetch(old), ofp);
700 1.1 cgd }
701 1.1 cgd last_frozen_line++;
702 1.1 cgd old++;
703 1.1 cgd }
704 1.1 cgd else if (new > pat_end) {
705 1.1 cgd break;
706 1.1 cgd }
707 1.1 cgd else if (pch_char(new) == '+') {
708 1.1 cgd copy_till(where + old - 1);
709 1.1 cgd if (R_do_defines) {
710 1.1 cgd if (def_state == IN_IFNDEF) {
711 1.1 cgd fputs(else_defined, ofp);
712 1.1 cgd def_state = IN_ELSE;
713 1.1 cgd }
714 1.1 cgd else if (def_state == OUTSIDE) {
715 1.1 cgd fputs(if_defined, ofp);
716 1.1 cgd def_state = IN_IFDEF;
717 1.1 cgd }
718 1.1 cgd }
719 1.1 cgd fputs(pfetch(new), ofp);
720 1.1 cgd new++;
721 1.1 cgd }
722 1.1 cgd else if (pch_char(new) != pch_char(old)) {
723 1.14 kristerw say("Out-of-sync patch, lines %d,%d--mangled text or line numbers, maybe?\n",
724 1.1 cgd pch_hunk_beg() + old,
725 1.1 cgd pch_hunk_beg() + new);
726 1.1 cgd #ifdef DEBUGGING
727 1.11 kristerw say("oldchar = '%c', newchar = '%c'\n",
728 1.1 cgd pch_char(old), pch_char(new));
729 1.1 cgd #endif
730 1.1 cgd my_exit(1);
731 1.1 cgd }
732 1.1 cgd else if (pch_char(new) == '!') {
733 1.1 cgd copy_till(where + old - 1);
734 1.1 cgd if (R_do_defines) {
735 1.1 cgd fputs(not_defined, ofp);
736 1.1 cgd def_state = IN_IFNDEF;
737 1.1 cgd }
738 1.1 cgd while (pch_char(old) == '!') {
739 1.1 cgd if (R_do_defines) {
740 1.1 cgd fputs(pfetch(old), ofp);
741 1.1 cgd }
742 1.1 cgd last_frozen_line++;
743 1.1 cgd old++;
744 1.1 cgd }
745 1.1 cgd if (R_do_defines) {
746 1.1 cgd fputs(else_defined, ofp);
747 1.1 cgd def_state = IN_ELSE;
748 1.1 cgd }
749 1.1 cgd while (pch_char(new) == '!') {
750 1.1 cgd fputs(pfetch(new), ofp);
751 1.1 cgd new++;
752 1.1 cgd }
753 1.1 cgd }
754 1.1 cgd else {
755 1.1 cgd assert(pch_char(new) == ' ');
756 1.1 cgd old++;
757 1.1 cgd new++;
758 1.1 cgd if (R_do_defines && def_state != OUTSIDE) {
759 1.1 cgd fputs(end_defined, ofp);
760 1.1 cgd def_state = OUTSIDE;
761 1.1 cgd }
762 1.1 cgd }
763 1.1 cgd }
764 1.1 cgd if (new <= pat_end && pch_char(new) == '+') {
765 1.1 cgd copy_till(where + old - 1);
766 1.1 cgd if (R_do_defines) {
767 1.1 cgd if (def_state == OUTSIDE) {
768 1.1 cgd fputs(if_defined, ofp);
769 1.1 cgd def_state = IN_IFDEF;
770 1.1 cgd }
771 1.1 cgd else if (def_state == IN_IFNDEF) {
772 1.1 cgd fputs(else_defined, ofp);
773 1.1 cgd def_state = IN_ELSE;
774 1.1 cgd }
775 1.1 cgd }
776 1.1 cgd while (new <= pat_end && pch_char(new) == '+') {
777 1.1 cgd fputs(pfetch(new), ofp);
778 1.1 cgd new++;
779 1.1 cgd }
780 1.1 cgd }
781 1.1 cgd if (R_do_defines && def_state != OUTSIDE) {
782 1.1 cgd fputs(end_defined, ofp);
783 1.1 cgd }
784 1.1 cgd }
785 1.1 cgd
786 1.1 cgd /* Open the new file. */
787 1.1 cgd
788 1.6 christos static void
789 1.10 kristerw init_output(char *name)
790 1.1 cgd {
791 1.1 cgd ofp = fopen(name, "w");
792 1.11 kristerw if (ofp == NULL)
793 1.11 kristerw pfatal("can't create %s", name);
794 1.1 cgd }
795 1.1 cgd
796 1.1 cgd /* Open a file to put hunks we can't locate. */
797 1.1 cgd
798 1.6 christos static void
799 1.10 kristerw init_reject(char *name)
800 1.1 cgd {
801 1.1 cgd rejfp = fopen(name, "w");
802 1.11 kristerw if (rejfp == NULL)
803 1.11 kristerw pfatal("can't create %s", name);
804 1.1 cgd }
805 1.1 cgd
806 1.1 cgd /* Copy input file to output, up to wherever hunk is to be applied. */
807 1.1 cgd
808 1.6 christos static void
809 1.10 kristerw copy_till(LINENUM lastline)
810 1.1 cgd {
811 1.10 kristerw LINENUM R_last_frozen_line = last_frozen_line;
812 1.1 cgd
813 1.1 cgd if (R_last_frozen_line > lastline)
814 1.11 kristerw fatal("misordered hunks! output would be garbled\n");
815 1.1 cgd while (R_last_frozen_line < lastline) {
816 1.1 cgd dump_line(++R_last_frozen_line);
817 1.1 cgd }
818 1.1 cgd last_frozen_line = R_last_frozen_line;
819 1.1 cgd }
820 1.1 cgd
821 1.1 cgd /* Finish copying the input file to the output file. */
822 1.1 cgd
823 1.6 christos static void
824 1.10 kristerw spew_output(void)
825 1.1 cgd {
826 1.1 cgd #ifdef DEBUGGING
827 1.1 cgd if (debug & 256)
828 1.14 kristerw say("il=%d lfl=%d\n",input_lines,last_frozen_line);
829 1.1 cgd #endif
830 1.1 cgd if (input_lines)
831 1.1 cgd copy_till(input_lines); /* dump remainder of file */
832 1.1 cgd Fclose(ofp);
833 1.11 kristerw ofp = NULL;
834 1.1 cgd }
835 1.1 cgd
836 1.1 cgd /* Copy one line from input to output. */
837 1.1 cgd
838 1.6 christos static void
839 1.10 kristerw dump_line(LINENUM line)
840 1.1 cgd {
841 1.10 kristerw char *s;
842 1.10 kristerw char R_newline = '\n';
843 1.1 cgd
844 1.1 cgd /* Note: string is not null terminated. */
845 1.16 kristerw for (s=ifetch(line); putc(*s, ofp) != R_newline; s++) ;
846 1.1 cgd }
847 1.1 cgd
848 1.1 cgd /* Does the patch pattern match at line base+offset? */
849 1.1 cgd
850 1.6 christos static bool
851 1.10 kristerw patch_match(LINENUM base, LINENUM offset, LINENUM fuzz)
852 1.10 kristerw {
853 1.10 kristerw LINENUM pline = 1 + fuzz;
854 1.10 kristerw LINENUM iline;
855 1.10 kristerw LINENUM pat_lines = pch_ptrn_lines() - fuzz;
856 1.1 cgd
857 1.1 cgd for (iline=base+offset+fuzz; pline <= pat_lines; pline++,iline++) {
858 1.1 cgd if (canonicalize) {
859 1.16 kristerw if (!similar(ifetch(iline),
860 1.1 cgd pfetch(pline),
861 1.1 cgd pch_line_len(pline) ))
862 1.1 cgd return FALSE;
863 1.1 cgd }
864 1.16 kristerw else if (strnNE(ifetch(iline),
865 1.1 cgd pfetch(pline),
866 1.1 cgd pch_line_len(pline) ))
867 1.1 cgd return FALSE;
868 1.1 cgd }
869 1.1 cgd return TRUE;
870 1.1 cgd }
871 1.1 cgd
872 1.1 cgd /* Do two lines match with canonicalized white space? */
873 1.1 cgd
874 1.6 christos static bool
875 1.17 kristerw similar(char *a, char *b, size_t len)
876 1.1 cgd {
877 1.1 cgd while (len) {
878 1.7 christos if (isspace((unsigned char)*b)) {/* whitespace (or \n) to match? */
879 1.7 christos if (!isspace((unsigned char)*a))/* no corresponding whitespace? */
880 1.1 cgd return FALSE;
881 1.7 christos while (len && isspace((unsigned char)*b) && *b != '\n')
882 1.1 cgd b++,len--; /* skip pattern whitespace */
883 1.7 christos while (isspace((unsigned char)*a) && *a != '\n')
884 1.1 cgd a++; /* skip target whitespace */
885 1.1 cgd if (*a == '\n' || *b == '\n')
886 1.1 cgd return (*a == *b); /* should end in sync */
887 1.1 cgd }
888 1.1 cgd else if (*a++ != *b++) /* match non-whitespace chars */
889 1.1 cgd return FALSE;
890 1.1 cgd else
891 1.1 cgd len--; /* probably not necessary */
892 1.1 cgd }
893 1.1 cgd return TRUE; /* actually, this is not reached */
894 1.1 cgd /* since there is always a \n */
895 1.1 cgd }
896 1.1 cgd
897 1.1 cgd /* Exit with cleanup. */
898 1.1 cgd
899 1.1 cgd void
900 1.10 kristerw my_exit(int status)
901 1.1 cgd {
902 1.1 cgd Unlink(TMPINNAME);
903 1.1 cgd if (!toutkeep) {
904 1.1 cgd Unlink(TMPOUTNAME);
905 1.1 cgd }
906 1.1 cgd if (!trejkeep) {
907 1.1 cgd Unlink(TMPREJNAME);
908 1.1 cgd }
909 1.1 cgd Unlink(TMPPATNAME);
910 1.1 cgd exit(status);
911 1.1 cgd }
912