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