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