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