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