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