1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
|
/* $OpenBSD: pch.c,v 1.18 2003/07/21 14:27:35 deraadt Exp $ */
#ifndef lint
static char rcsid[] = "$OpenBSD: pch.c,v 1.18 2003/07/21 14:27:35 deraadt Exp $";
#endif /* not lint */
#include "EXTERN.h"
#include "common.h"
#include "util.h"
#include "INTERN.h"
#include "pch.h"
extern bool check_only;
/* Patch (diff listing) abstract type. */
static long p_filesize; /* size of the patch file */
static LINENUM p_first; /* 1st line number */
static LINENUM p_newfirst; /* 1st line number of replacement */
static LINENUM p_ptrn_lines; /* # lines in pattern */
static LINENUM p_repl_lines; /* # lines in replacement text */
static LINENUM p_end = -1; /* last line in hunk */
static LINENUM p_max; /* max allowed value of p_end */
static LINENUM p_context = 3; /* # of context lines */
static LINENUM p_input_line = 0; /* current line # from patch file */
static char **p_line = Null(char **); /* the text of the hunk */
static short *p_len = Null(short *); /* length of each line */
static char *p_char = Nullch;/* +, -, and ! */
static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */
static int p_indent; /* indent to patch */
static LINENUM p_base; /* where to intuit this time */
static LINENUM p_bline; /* line # of p_base */
static LINENUM p_start; /* where intuit found a patch */
static LINENUM p_sline; /* and the line number for it */
static LINENUM p_hunk_beg; /* line number of current hunk */
static LINENUM p_efake = -1; /* end of faked up lines--don't free */
static LINENUM p_bfake = -1; /* beg of faked up lines */
/*
* Prepare to look for the next patch in the patch file.
*/
void
re_patch(void)
{
p_first = Nulline;
p_newfirst = Nulline;
p_ptrn_lines = Nulline;
p_repl_lines = Nulline;
p_end = (LINENUM) - 1;
p_max = Nulline;
p_indent = 0;
}
/*
* Open the patch file at the beginning of time.
*/
void
open_patch_file(char *filename)
{
if (filename == Nullch || !*filename || strEQ(filename, "-")) {
pfp = fopen(TMPPATNAME, "w");
if (pfp == Nullfp)
pfatal("can't create %s", TMPPATNAME);
while (fgets(buf, sizeof buf, stdin) != Nullch)
fputs(buf, pfp);
fclose(pfp);
filename = TMPPATNAME;
}
pfp = fopen(filename, "r");
if (pfp == Nullfp)
pfatal("patch file %s not found", filename);
fstat(fileno(pfp), &filestat);
p_filesize = filestat.st_size;
next_intuit_at(0L, 1L); /* start at the beginning */
set_hunkmax();
}
/*
* Make sure our dynamically realloced tables are malloced to begin with.
*/
void
set_hunkmax(void)
{
#ifndef lint
if (p_line == Null(char **))
p_line = (char **) malloc((MEM) hunkmax * sizeof(char *));
if (p_len == Null(short *))
p_len = (short *) malloc((MEM) hunkmax * sizeof(short));
#endif
if (p_char == Nullch)
p_char = (char *) malloc((MEM) hunkmax * sizeof(char));
}
/*
* Enlarge the arrays containing the current hunk of patch.
*/
void
grow_hunkmax(void)
{
hunkmax *= 2;
/*
* Note that on most systems, only the p_line array ever gets fresh memory
* since p_len can move into p_line's old space, and p_char can move into
* p_len's old space. Not on PDP-11's however. But it doesn't matter.
*/
assert(p_line != Null(char **) &&p_len != Null(short *) &&p_char != Nullch);
#ifndef lint
p_line = (char **) realloc((char *) p_line, (MEM) hunkmax * sizeof(char *));
p_len = (short *) realloc((char *) p_len, (MEM) hunkmax * sizeof(short));
p_char = (char *) realloc((char *) p_char, (MEM) hunkmax * sizeof(char));
#endif
if (p_line != Null(char **) &&p_len != Null(short *) &&p_char != Nullch)
return;
if (!using_plan_a)
fatal("out of memory\n");
out_of_mem = TRUE; /* whatever is null will be allocated again */
/* from within plan_a(), of all places */
}
/* True if the remainder of the patch file contains a diff of some sort. */
bool
there_is_another_patch(void)
{
if (p_base != 0L && p_base >= p_filesize) {
if (verbose)
say("done\n");
return FALSE;
}
if (verbose)
say("Hmm...");
diff_type = intuit_diff_type();
if (!diff_type) {
if (p_base != 0L) {
if (verbose)
say(" Ignoring the trailing garbage.\ndone\n");
} else
say(" I can't seem to find a patch in there anywhere.\n");
return FALSE;
}
if (verbose)
say(" %sooks like %s to me...\n",
(p_base == 0L ? "L" : "The next patch l"),
diff_type == UNI_DIFF ? "a unified diff" :
diff_type == CONTEXT_DIFF ? "a context diff" :
diff_type == NEW_CONTEXT_DIFF ? "a new-style context diff" :
diff_type == NORMAL_DIFF ? "a normal diff" :
"an ed script");
if (p_indent && verbose)
say("(Patch is indented %d space%s.)\n", p_indent,
p_indent == 1 ? "" : "s");
skip_to(p_start, p_sline);
while (filearg[0] == Nullch) {
if (force || batch) {
say("No file to patch. Skipping...\n");
filearg[0] = savestr(bestguess);
skip_rest_of_patch = TRUE;
return TRUE;
}
ask("File to patch: ");
if (*buf != '\n') {
if (bestguess)
free(bestguess);
bestguess = savestr(buf);
filearg[0] = fetchname(buf, 0, FALSE);
}
if (filearg[0] == Nullch) {
ask("No file found--skip this patch? [n] ");
if (*buf != 'y')
continue;
if (verbose)
say("Skipping patch...\n");
filearg[0] = fetchname(bestguess, 0, TRUE);
skip_rest_of_patch = TRUE;
return TRUE;
}
}
return TRUE;
}
/* Determine what kind of diff is in the remaining part of the patch file. */
int
intuit_diff_type(void)
{
long this_line = 0, previous_line;
long first_command_line = -1, fcl_line;
bool last_line_was_command = FALSE, this_is_a_command = FALSE;
bool stars_last_line = FALSE, stars_this_line = FALSE;
char *s, *t;
char *indtmp = Nullch;
char *oldtmp = Nullch;
char *newtmp = Nullch;
char *indname = Nullch;
char *oldname = Nullch;
char *newname = Nullch;
int indent, retval;
bool no_filearg = (filearg[0] == Nullch);
ok_to_create_file = FALSE;
fseek(pfp, p_base, 0);
p_input_line = p_bline - 1;
for (;;) {
previous_line = this_line;
last_line_was_command = this_is_a_command;
stars_last_line = stars_this_line;
this_line = ftell(pfp);
indent = 0;
p_input_line++;
if (fgets(buf, sizeof buf, pfp) == Nullch) {
if (first_command_line >= 0L) {
/* nothing but deletes!? */
p_start = first_command_line;
p_sline = fcl_line;
retval = ED_DIFF;
goto scan_exit;
} else {
p_start = this_line;
p_sline = p_input_line;
retval = 0;
goto scan_exit;
}
}
for (s = buf; *s == ' ' || *s == '\t' || *s == 'X'; s++) {
if (*s == '\t')
indent += 8 - (indent % 8);
else
indent++;
}
for (t = s; isdigit(*t) || *t == ','; t++)
;
this_is_a_command = (isdigit(*s) &&
(*t == 'd' || *t == 'c' || *t == 'a'));
if (first_command_line < 0L && this_is_a_command) {
first_command_line = this_line;
fcl_line = p_input_line;
p_indent = indent; /* assume this for now */
}
if (!stars_last_line && strnEQ(s, "*** ", 4))
oldtmp = savestr(s + 4);
else if (strnEQ(s, "--- ", 4))
newtmp = savestr(s + 4);
else if (strnEQ(s, "+++ ", 4))
oldtmp = savestr(s + 4); /* pretend it is the old
* name */
else if (strnEQ(s, "Index:", 6))
indtmp = savestr(s + 6);
else if (strnEQ(s, "Prereq:", 7)) {
for (t = s + 7; isspace(*t); t++)
;
revision = savestr(t);
for (t = revision; *t && !isspace(*t); t++)
;
*t = '\0';
if (!*revision) {
free(revision);
revision = Nullch;
}
}
if ((!diff_type || diff_type == ED_DIFF) &&
first_command_line >= 0L &&
strEQ(s, ".\n")) {
p_indent = indent;
p_start = first_command_line;
p_sline = fcl_line;
retval = ED_DIFF;
goto scan_exit;
}
if ((!diff_type || diff_type == UNI_DIFF) && strnEQ(s, "@@ -", 4)) {
if (!atol(s + 3))
ok_to_create_file = TRUE;
p_indent = indent;
p_start = this_line;
p_sline = p_input_line;
retval = UNI_DIFF;
goto scan_exit;
}
stars_this_line = strnEQ(s, "********", 8);
if ((!diff_type || diff_type == CONTEXT_DIFF) && stars_last_line &&
strnEQ(s, "*** ", 4)) {
if (!atol(s + 4))
ok_to_create_file = TRUE;
/*
* if this is a new context diff the character just
* before
*/
/* the newline is a '*'. */
while (*s != '\n')
s++;
p_indent = indent;
p_start = previous_line;
p_sline = p_input_line - 1;
retval = (*(s - 1) == '*' ? NEW_CONTEXT_DIFF : CONTEXT_DIFF);
goto scan_exit;
}
if ((!diff_type || diff_type == NORMAL_DIFF) &&
last_line_was_command &&
(strnEQ(s, "< ", 2) || strnEQ(s, "> ", 2))) {
p_start = previous_line;
p_sline = p_input_line - 1;
p_indent = indent;
retval = NORMAL_DIFF;
goto scan_exit;
}
}
scan_exit:
if (no_filearg) {
if (indtmp != Nullch)
indname = fetchname(indtmp, strippath, ok_to_create_file);
if (oldtmp != Nullch)
oldname = fetchname(oldtmp, strippath, ok_to_create_file);
if (newtmp != Nullch)
newname = fetchname(newtmp, strippath, ok_to_create_file);
if (indname)
filearg[0] = savestr(indname);
else if (oldname && newname) {
if (strlen(oldname) < strlen(newname))
filearg[0] = savestr(oldname);
else
filearg[0] = savestr(newname);
} else if (oldname)
filearg[0] = savestr(oldname);
else if (newname)
filearg[0] = savestr(newname);
}
if (bestguess) {
free(bestguess);
bestguess = Nullch;
}
if (filearg[0] != Nullch)
bestguess = savestr(filearg[0]);
else if (indtmp != Nullch)
bestguess = fetchname(indtmp, strippath, TRUE);
else {
if (oldtmp != Nullch)
oldname = fetchname(oldtmp, strippath, TRUE);
if (newtmp != Nullch)
newname = fetchname(newtmp, strippath, TRUE);
if (oldname && newname) {
if (strlen(oldname) < strlen(newname))
bestguess = savestr(oldname);
else
bestguess = savestr(newname);
} else if (oldname)
bestguess = savestr(oldname);
else if (newname)
bestguess = savestr(newname);
}
if (indtmp != Nullch)
free(indtmp);
if (oldtmp != Nullch)
free(oldtmp);
if (newtmp != Nullch)
free(newtmp);
if (indname != Nullch)
free(indname);
if (oldname != Nullch)
free(oldname);
if (newname != Nullch)
free(newname);
return retval;
}
/*
* Remember where this patch ends so we know where to start up again.
*/
void
next_intuit_at(long file_pos, long file_line)
{
p_base = file_pos;
p_bline = file_line;
}
/*
* Basically a verbose fseek() to the actual diff listing.
*/
void
skip_to(long file_pos, long file_line)
{
char *ret;
assert(p_base <= file_pos);
if (verbose && p_base < file_pos) {
fseek(pfp, p_base, 0);
say("The text leading up to this was:\n--------------------------\n");
while (ftell(pfp) < file_pos) {
ret = fgets(buf, sizeof buf, pfp);
assert(ret != Nullch);
say("|%s", buf);
}
say("--------------------------\n");
} else
fseek(pfp, file_pos, 0);
p_input_line = file_line - 1;
}
/* Make this a function for better debugging. */
static void
malformed(void)
{
fatal("malformed patch at line %ld: %s", p_input_line, buf);
/* about as informative as "Syntax error" in C */
}
/*
* True if the line has been discarded (i.e. it is a line saying
* "\ No newline at end of file".)
*/
static bool
remove_special_line(void)
{
int c;
c = fgetc(pfp);
if (c == '\\') {
do {
c = fgetc(pfp);
} while (c != EOF && c != '\n');
return TRUE;
}
if (c != EOF)
fseek(pfp, -1L, SEEK_CUR);
return FALSE;
}
/*
* True if there is more of the current diff listing to process.
*/
bool
another_hunk(void)
{
long line_beginning; /* file pos of the current line */
LINENUM repl_beginning; /* index of --- line */
LINENUM fillcnt; /* #lines of missing ptrn or repl */
LINENUM fillsrc; /* index of first line to copy */
LINENUM filldst; /* index of first missing line */
bool ptrn_spaces_eaten; /* ptrn was slightly misformed */
bool repl_could_be_missing; /* no + or ! lines in this hunk */
bool repl_missing; /* we are now backtracking */
long repl_backtrack_position; /* file pos of first repl line */
LINENUM repl_patch_line; /* input line number for same */
LINENUM ptrn_copiable; /* # of copiable lines in ptrn */
char *s, *ret;
int context = 0;
while (p_end >= 0) {
if (p_end == p_efake)
p_end = p_bfake; /* don't free twice */
else
free(p_line[p_end]);
p_end--;
}
assert(p_end == -1);
p_efake = -1;
p_max = hunkmax; /* gets reduced when --- found */
if (diff_type == CONTEXT_DIFF || diff_type == NEW_CONTEXT_DIFF) {
line_beginning = ftell(pfp);
repl_beginning = 0;
fillcnt = 0;
ptrn_spaces_eaten = FALSE;
repl_could_be_missing = TRUE;
repl_missing = FALSE;
repl_backtrack_position = 0;
ptrn_copiable = 0;
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch || strnNE(buf, "********", 8)) {
next_intuit_at(line_beginning, p_input_line);
return FALSE;
}
p_context = 100;
p_hunk_beg = p_input_line + 1;
while (p_end < p_max) {
line_beginning = ftell(pfp);
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch) {
if (p_max - p_end < 4) {
/* assume blank lines got chopped */
strlcpy(buf, " \n", sizeof buf);
} else {
if (repl_beginning && repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
}
fatal("unexpected end of file in patch\n");
}
}
p_end++;
assert(p_end < hunkmax);
p_char[p_end] = *buf;
p_line[p_end] = Nullch;
switch (*buf) {
case '*':
if (strnEQ(buf, "********", 8)) {
if (repl_beginning && repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
} else
fatal("unexpected end of hunk "
"at line %ld\n",
p_input_line);
}
if (p_end != 0) {
if (repl_beginning && repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
}
fatal("unexpected *** at line %ld: %s",
p_input_line, buf);
}
context = 0;
p_line[p_end] = savestr(buf);
if (out_of_mem) {
p_end--;
return FALSE;
}
for (s = buf; *s && !isdigit(*s); s++)
;
if (!*s)
malformed();
if (strnEQ(s, "0,0", 3))
memmove(s, s + 2, strlen(s + 2) + 1);
p_first = (LINENUM) atol(s);
while (isdigit(*s))
s++;
if (*s == ',') {
for (; *s && !isdigit(*s); s++)
;
if (!*s)
malformed();
p_ptrn_lines = ((LINENUM) atol(s)) - p_first + 1;
} else if (p_first)
p_ptrn_lines = 1;
else {
p_ptrn_lines = 0;
p_first = 1;
}
p_max = p_ptrn_lines + 6; /* we need this much at
* least */
while (p_max >= hunkmax)
grow_hunkmax();
p_max = hunkmax;
break;
case '-':
if (buf[1] == '-') {
if (repl_beginning ||
(p_end != p_ptrn_lines + 1 +
(p_char[p_end - 1] == '\n'))) {
if (p_end == 1) {
/*
* `old' lines were omitted;
* set up to fill them in
* from 'new' context lines.
*/
p_end = p_ptrn_lines + 1;
fillsrc = p_end + 1;
filldst = 1;
fillcnt = p_ptrn_lines;
} else {
if (repl_beginning) {
if (repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
}
fatal("duplicate \"---\" at line %ld--check line numbers at line %ld\n",
p_input_line, p_hunk_beg + repl_beginning);
} else {
fatal("%s \"---\" at line %ld--check line numbers at line %ld\n",
(p_end <= p_ptrn_lines
? "Premature"
: "Overdue"),
p_input_line, p_hunk_beg);
}
}
}
repl_beginning = p_end;
repl_backtrack_position = ftell(pfp);
repl_patch_line = p_input_line;
p_line[p_end] = savestr(buf);
if (out_of_mem) {
p_end--;
return FALSE;
}
p_char[p_end] = '=';
for (s = buf; *s && !isdigit(*s); s++)
;
if (!*s)
malformed();
p_newfirst = (LINENUM) atol(s);
while (isdigit(*s))
s++;
if (*s == ',') {
for (; *s && !isdigit(*s); s++)
;
if (!*s)
malformed();
p_repl_lines = ((LINENUM) atol(s)) -
p_newfirst + 1;
} else if (p_newfirst)
p_repl_lines = 1;
else {
p_repl_lines = 0;
p_newfirst = 1;
}
p_max = p_repl_lines + p_end;
if (p_max > MAXHUNKSIZE)
fatal("hunk too large (%ld lines) at line %ld: %s",
p_max, p_input_line, buf);
while (p_max >= hunkmax)
grow_hunkmax();
if (p_repl_lines != ptrn_copiable &&
(p_context != 0 || p_repl_lines != 1))
repl_could_be_missing = FALSE;
break;
}
goto change_line;
case '+':
case '!':
repl_could_be_missing = FALSE;
change_line:
if (buf[1] == '\n' && canonicalize)
strlcpy(buf + 1, " \n", sizeof buf - 1);
if (!isspace(buf[1]) && buf[1] != '>' &&
buf[1] != '<' &&
repl_beginning && repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
}
if (context >= 0) {
if (context < p_context)
p_context = context;
context = -1000;
}
p_line[p_end] = savestr(buf + 2);
if (out_of_mem) {
p_end--;
return FALSE;
}
if (p_end == p_ptrn_lines) {
if (remove_special_line()) {
int len;
len = strlen(p_line[p_end]) - 1;
(p_line[p_end])[len] = 0;
}
}
break;
case '\t':
case '\n': /* assume the 2 spaces got eaten */
if (repl_beginning && repl_could_be_missing &&
(!ptrn_spaces_eaten ||
diff_type == NEW_CONTEXT_DIFF)) {
repl_missing = TRUE;
goto hunk_done;
}
p_line[p_end] = savestr(buf);
if (out_of_mem) {
p_end--;
return FALSE;
}
if (p_end != p_ptrn_lines + 1) {
ptrn_spaces_eaten |= (repl_beginning != 0);
context++;
if (!repl_beginning)
ptrn_copiable++;
p_char[p_end] = ' ';
}
break;
case ' ':
if (!isspace(buf[1]) &&
repl_beginning && repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
}
context++;
if (!repl_beginning)
ptrn_copiable++;
p_line[p_end] = savestr(buf + 2);
if (out_of_mem) {
p_end--;
return FALSE;
}
break;
default:
if (repl_beginning && repl_could_be_missing) {
repl_missing = TRUE;
goto hunk_done;
}
malformed();
}
/* set up p_len for strncmp() so we don't have to */
/* assume null termination */
if (p_line[p_end])
p_len[p_end] = strlen(p_line[p_end]);
else
p_len[p_end] = 0;
}
hunk_done:
if (p_end >= 0 && !repl_beginning)
fatal("no --- found in patch at line %ld\n", pch_hunk_beg());
if (repl_missing) {
/* reset state back to just after --- */
p_input_line = repl_patch_line;
for (p_end--; p_end > repl_beginning; p_end--)
free(p_line[p_end]);
fseek(pfp, repl_backtrack_position, 0);
/* redundant 'new' context lines were omitted - set */
/* up to fill them in from the old file context */
if (!p_context && p_repl_lines == 1) {
p_repl_lines = 0;
p_max--;
}
fillsrc = 1;
filldst = repl_beginning + 1;
fillcnt = p_repl_lines;
p_end = p_max;
} else if (!p_context && fillcnt == 1) {
/* the first hunk was a null hunk with no context */
/* and we were expecting one line -- fix it up. */
while (filldst < p_end) {
p_line[filldst] = p_line[filldst + 1];
p_char[filldst] = p_char[filldst + 1];
p_len[filldst] = p_len[filldst + 1];
filldst++;
}
#if 0
repl_beginning--; /* this doesn't need to be
* fixed */
#endif
p_end--;
p_first++; /* do append rather than insert */
fillcnt = 0;
p_ptrn_lines = 0;
}
if (diff_type == CONTEXT_DIFF &&
(fillcnt || (p_first > 1 && ptrn_copiable > 2 * p_context))) {
if (verbose)
say("%s\n%s\n%s\n",
"(Fascinating--this is really a new-style context diff but without",
"the telltale extra asterisks on the *** line that usually indicate",
"the new style...)");
diff_type = NEW_CONTEXT_DIFF;
}
/* if there were omitted context lines, fill them in now */
if (fillcnt) {
p_bfake = filldst; /* remember where not to
* free() */
p_efake = filldst + fillcnt - 1;
while (fillcnt-- > 0) {
while (fillsrc <= p_end && p_char[fillsrc] != ' ')
fillsrc++;
if (fillsrc > p_end)
fatal("replacement text or line numbers mangled in hunk at line %ld\n",
p_hunk_beg);
p_line[filldst] = p_line[fillsrc];
p_char[filldst] = p_char[fillsrc];
p_len[filldst] = p_len[fillsrc];
fillsrc++;
filldst++;
}
while (fillsrc <= p_end && fillsrc != repl_beginning &&
p_char[fillsrc] != ' ')
fillsrc++;
#ifdef DEBUGGING
if (debug & 64)
printf("fillsrc %ld, filldst %ld, rb %ld, e+1 %ld\n",
fillsrc, filldst, repl_beginning, p_end + 1);
#endif
assert(fillsrc == p_end + 1 || fillsrc == repl_beginning);
assert(filldst == p_end + 1 || filldst == repl_beginning);
}
if (p_line[p_end] != NULL) {
if (remove_special_line()) {
p_len[p_end] -= 1;
(p_line[p_end])[p_len[p_end]] = 0;
}
}
} else if (diff_type == UNI_DIFF) {
long line_beginning = ftell(pfp); /* file pos of the current line */
LINENUM fillsrc; /* index of old lines */
LINENUM filldst; /* index of new lines */
char ch;
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch || strnNE(buf, "@@ -", 4)) {
next_intuit_at(line_beginning, p_input_line);
return FALSE;
}
s = buf + 4;
if (!*s)
malformed();
p_first = (LINENUM) atol(s);
while (isdigit(*s))
s++;
if (*s == ',') {
p_ptrn_lines = (LINENUM) atol(++s);
while (isdigit(*s))
s++;
} else
p_ptrn_lines = 1;
if (*s == ' ')
s++;
if (*s != '+' || !*++s)
malformed();
p_newfirst = (LINENUM) atol(s);
while (isdigit(*s))
s++;
if (*s == ',') {
p_repl_lines = (LINENUM) atol(++s);
while (isdigit(*s))
s++;
} else
p_repl_lines = 1;
if (*s == ' ')
s++;
if (*s != '@')
malformed();
if (!p_ptrn_lines)
p_first++; /* do append rather than insert */
p_max = p_ptrn_lines + p_repl_lines + 1;
while (p_max >= hunkmax)
grow_hunkmax();
fillsrc = 1;
filldst = fillsrc + p_ptrn_lines;
p_end = filldst + p_repl_lines;
snprintf(buf, sizeof buf, "*** %ld,%ld ****\n", p_first,
p_first + p_ptrn_lines - 1);
p_line[0] = savestr(buf);
if (out_of_mem) {
p_end = -1;
return FALSE;
}
p_char[0] = '*';
snprintf(buf, sizeof buf, "--- %ld,%ld ----\n", p_newfirst,
p_newfirst + p_repl_lines - 1);
p_line[filldst] = savestr(buf);
if (out_of_mem) {
p_end = 0;
return FALSE;
}
p_char[filldst++] = '=';
p_context = 100;
context = 0;
p_hunk_beg = p_input_line + 1;
while (fillsrc <= p_ptrn_lines || filldst <= p_end) {
line_beginning = ftell(pfp);
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch) {
if (p_max - filldst < 3) {
/* assume blank lines got chopped */
strlcpy(buf, " \n", sizeof buf);
} else {
fatal("unexpected end of file in patch\n");
}
}
if (*buf == '\t' || *buf == '\n') {
ch = ' '; /* assume the space got eaten */
s = savestr(buf);
} else {
ch = *buf;
s = savestr(buf + 1);
}
if (out_of_mem) {
while (--filldst > p_ptrn_lines)
free(p_line[filldst]);
p_end = fillsrc - 1;
return FALSE;
}
switch (ch) {
case '-':
if (fillsrc > p_ptrn_lines) {
free(s);
p_end = filldst - 1;
malformed();
}
p_char[fillsrc] = ch;
p_line[fillsrc] = s;
p_len[fillsrc++] = strlen(s);
if (fillsrc > p_ptrn_lines) {
if (remove_special_line()) {
p_len[fillsrc - 1] -= 1;
s[p_len[fillsrc - 1]] = 0;
}
}
break;
case '=':
ch = ' ';
/* FALL THROUGH */
case ' ':
if (fillsrc > p_ptrn_lines) {
free(s);
while (--filldst > p_ptrn_lines)
free(p_line[filldst]);
p_end = fillsrc - 1;
malformed();
}
context++;
p_char[fillsrc] = ch;
p_line[fillsrc] = s;
p_len[fillsrc++] = strlen(s);
s = savestr(s);
if (out_of_mem) {
while (--filldst > p_ptrn_lines)
free(p_line[filldst]);
p_end = fillsrc - 1;
return FALSE;
}
/* FALL THROUGH */
case '+':
if (filldst > p_end) {
free(s);
while (--filldst > p_ptrn_lines)
free(p_line[filldst]);
p_end = fillsrc - 1;
malformed();
}
p_char[filldst] = ch;
p_line[filldst] = s;
p_len[filldst++] = strlen(s);
if (fillsrc > p_ptrn_lines) {
if (remove_special_line()) {
p_len[filldst - 1] -= 1;
s[p_len[filldst - 1]] = 0;
}
}
break;
default:
p_end = filldst;
malformed();
}
if (ch != ' ' && context > 0) {
if (context < p_context)
p_context = context;
context = -1000;
}
} /* while */
} else { /* normal diff--fake it up */
char hunk_type;
int i;
LINENUM min, max;
long line_beginning = ftell(pfp);
p_context = 0;
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch || !isdigit(*buf)) {
next_intuit_at(line_beginning, p_input_line);
return FALSE;
}
p_first = (LINENUM) atol(buf);
for (s = buf; isdigit(*s); s++)
;
if (*s == ',') {
p_ptrn_lines = (LINENUM) atol(++s) - p_first + 1;
while (isdigit(*s))
s++;
} else
p_ptrn_lines = (*s != 'a');
hunk_type = *s;
if (hunk_type == 'a')
p_first++; /* do append rather than insert */
min = (LINENUM) atol(++s);
for (; isdigit(*s); s++)
;
if (*s == ',')
max = (LINENUM) atol(++s);
else
max = min;
if (hunk_type == 'd')
min++;
p_end = p_ptrn_lines + 1 + max - min + 1;
if (p_end > MAXHUNKSIZE)
fatal("hunk too large (%ld lines) at line %ld: %s",
p_end, p_input_line, buf);
while (p_end >= hunkmax)
grow_hunkmax();
p_newfirst = min;
p_repl_lines = max - min + 1;
snprintf(buf, sizeof buf, "*** %ld,%ld\n", p_first,
p_first + p_ptrn_lines - 1);
p_line[0] = savestr(buf);
if (out_of_mem) {
p_end = -1;
return FALSE;
}
p_char[0] = '*';
for (i = 1; i <= p_ptrn_lines; i++) {
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch)
fatal("unexpected end of file in patch at line %ld\n",
p_input_line);
if (*buf != '<')
fatal("< expected at line %ld of patch\n",
p_input_line);
p_line[i] = savestr(buf + 2);
if (out_of_mem) {
p_end = i - 1;
return FALSE;
}
p_len[i] = strlen(p_line[i]);
p_char[i] = '-';
}
if (remove_special_line()) {
p_len[i - 1] -= 1;
(p_line[i - 1])[p_len[i - 1]] = 0;
}
if (hunk_type == 'c') {
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch)
fatal("unexpected end of file in patch at line %ld\n",
p_input_line);
if (*buf != '-')
fatal("--- expected at line %ld of patch\n",
p_input_line);
}
snprintf(buf, sizeof(buf), "--- %ld,%ld\n", min, max);
p_line[i] = savestr(buf);
if (out_of_mem) {
p_end = i - 1;
return FALSE;
}
p_char[i] = '=';
for (i++; i <= p_end; i++) {
ret = pgets(buf, sizeof buf, pfp);
p_input_line++;
if (ret == Nullch)
fatal("unexpected end of file in patch at line %ld\n",
p_input_line);
if (*buf != '>')
fatal("> expected at line %ld of patch\n",
p_input_line);
p_line[i] = savestr(buf + 2);
if (out_of_mem) {
p_end = i - 1;
return FALSE;
}
p_len[i] = strlen(p_line[i]);
p_char[i] = '+';
}
if (remove_special_line()) {
p_len[i - 1] -= 1;
(p_line[i - 1])[p_len[i - 1]] = 0;
}
}
if (reverse) /* backwards patch? */
if (!pch_swap())
say("Not enough memory to swap next hunk!\n");
#ifdef DEBUGGING
if (debug & 2) {
int i;
char special;
for (i = 0; i <= p_end; i++) {
if (i == p_ptrn_lines)
special = '^';
else
special = ' ';
fprintf(stderr, "%3d %c %c %s", i, p_char[i],
special, p_line[i]);
fflush(stderr);
}
}
#endif
if (p_end + 1 < hunkmax)/* paranoia reigns supreme... */
p_char[p_end + 1] = '^'; /* add a stopper for apply_hunk */
return TRUE;
}
/*
* Input a line from the patch file, worrying about indentation.
*/
char *
pgets(char *bf, int sz, FILE *fp)
{
char *s, *ret = fgets(bf, sz, fp);
int indent = 0;
if (p_indent && ret != Nullch) {
for (s = buf;
indent < p_indent && (*s == ' ' || *s == '\t' || *s == 'X');
s++) {
if (*s == '\t')
indent += 8 - (indent % 7);
else
indent++;
}
if (buf != s && strlcpy(buf, s, sizeof(buf)) >= sizeof(buf))
fatal("buffer too small in pgets()\n");
}
return ret;
}
/*
* Reverse the old and new portions of the current hunk.
*/
bool
pch_swap(void)
{
char **tp_line; /* the text of the hunk */
short *tp_len; /* length of each line */
char *tp_char; /* +, -, and ! */
LINENUM i;
LINENUM n;
bool blankline = FALSE;
char *s;
i = p_first;
p_first = p_newfirst;
p_newfirst = i;
/* make a scratch copy */
tp_line = p_line;
tp_len = p_len;
tp_char = p_char;
p_line = Null(char **); /* force set_hunkmax to allocate again */
p_len = Null(short *);
p_char = Nullch;
set_hunkmax();
if (p_line == Null(char **) ||p_len == Null(short *) ||p_char == Nullch) {
#ifndef lint
if (p_line == Null(char **))
free((char *) p_line);
p_line = tp_line;
if (p_len == Null(short *))
free((char *) p_len);
p_len = tp_len;
#endif
if (p_char == Nullch)
free((char *) p_char);
p_char = tp_char;
return FALSE; /* not enough memory to swap hunk! */
}
/* now turn the new into the old */
i = p_ptrn_lines + 1;
if (tp_char[i] == '\n') { /* account for possible blank line */
blankline = TRUE;
i++;
}
if (p_efake >= 0) { /* fix non-freeable ptr range */
if (p_efake <= i)
n = p_end - i + 1;
else
n = -i;
p_efake += n;
p_bfake += n;
}
for (n = 0; i <= p_end; i++, n++) {
p_line[n] = tp_line[i];
p_char[n] = tp_char[i];
if (p_char[n] == '+')
p_char[n] = '-';
p_len[n] = tp_len[i];
}
if (blankline) {
i = p_ptrn_lines + 1;
p_line[n] = tp_line[i];
p_char[n] = tp_char[i];
p_len[n] = tp_len[i];
n++;
}
assert(p_char[0] == '=');
p_char[0] = '*';
for (s = p_line[0]; *s; s++)
if (*s == '-')
*s = '*';
/* now turn the old into the new */
assert(tp_char[0] == '*');
tp_char[0] = '=';
for (s = tp_line[0]; *s; s++)
if (*s == '*')
*s = '-';
for (i = 0; n <= p_end; i++, n++) {
p_line[n] = tp_line[i];
p_char[n] = tp_char[i];
if (p_char[n] == '-')
p_char[n] = '+';
p_len[n] = tp_len[i];
}
assert(i == p_ptrn_lines + 1);
i = p_ptrn_lines;
p_ptrn_lines = p_repl_lines;
p_repl_lines = i;
#ifndef lint
if (tp_line == Null(char **))
free((char *) tp_line);
if (tp_len == Null(short *))
free((char *) tp_len);
#endif
if (tp_char == Nullch)
free((char *) tp_char);
return TRUE;
}
/*
* Return the specified line position in the old file of the old context.
*/
LINENUM
pch_first(void)
{
return p_first;
}
/*
* Return the number of lines of old context.
*/
LINENUM
pch_ptrn_lines(void)
{
return p_ptrn_lines;
}
/*
* Return the probable line position in the new file of the first line.
*/
LINENUM
pch_newfirst(void)
{
return p_newfirst;
}
/*
* Return the number of lines in the replacement text including context.
*/
LINENUM
pch_repl_lines(void)
{
return p_repl_lines;
}
/*
* Return the number of lines in the whole hunk.
*/
LINENUM
pch_end(void)
{
return p_end;
}
/*
* Return the number of context lines before the first changed line.
*/
LINENUM
pch_context(void)
{
return p_context;
}
/*
* Return the length of a particular patch line.
*/
short
pch_line_len(LINENUM line)
{
return p_len[line];
}
/*
* Return the control character (+, -, *, !, etc) for a patch line.
*/
char
pch_char(LINENUM line)
{
return p_char[line];
}
/*
* Return a pointer to a particular patch line.
*/
char *
pfetch(LINENUM line)
{
return p_line[line];
}
/*
* Return where in the patch file this hunk began, for error messages.
*/
LINENUM
pch_hunk_beg(void)
{
return p_hunk_beg;
}
/*
* Apply an ed script by feeding ed itself.
*/
void
do_ed_script(void)
{
char *t;
long beginning_of_this_line;
bool this_line_is_command = FALSE;
FILE *pipefp;
if (!skip_rest_of_patch) {
unlink(TMPOUTNAME);
copy_file(filearg[0], TMPOUTNAME);
if (verbose)
snprintf(buf, sizeof buf, "/bin/ed %s", TMPOUTNAME);
else
snprintf(buf, sizeof buf, "/bin/ed - %s", TMPOUTNAME);
pipefp = popen(buf, "w");
}
for (;;) {
beginning_of_this_line = ftell(pfp);
if (pgets(buf, sizeof buf, pfp) == Nullch) {
next_intuit_at(beginning_of_this_line, p_input_line);
break;
}
p_input_line++;
for (t = buf; isdigit(*t) || *t == ','; t++)
;
this_line_is_command = (isdigit(*buf) &&
(*t == 'd' || *t == 'c' || *t == 'a'));
if (this_line_is_command) {
if (!skip_rest_of_patch)
fputs(buf, pipefp);
if (*t != 'd') {
while (pgets(buf, sizeof buf, pfp) != Nullch) {
p_input_line++;
if (!skip_rest_of_patch)
fputs(buf, pipefp);
if (strEQ(buf, ".\n"))
break;
}
}
} else {
next_intuit_at(beginning_of_this_line, p_input_line);
break;
}
}
if (skip_rest_of_patch)
return;
fprintf(pipefp, "w\n");
fprintf(pipefp, "q\n");
fflush(pipefp);
pclose(pipefp);
ignore_signals();
if (!check_only) {
if (move_file(TMPOUTNAME, outname) < 0) {
toutkeep = TRUE;
chmod(TMPOUTNAME, filemode);
} else
chmod(outname, filemode);
}
set_signals(1);
}
|