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
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
|
/*
* Copyright (c) 1992, Brian Berliner and Jeff Polk
* Copyright (c) 1989-1992, Brian Berliner
*
* You may distribute under the terms of the GNU General Public License as
* specified in the README file that comes with the CVS 1.4 kit.
*
* "update" updates the version in the present directory with respect to the RCS
* repository. The present version must have been created by "checkout". The
* user can keep up-to-date by calling "update" whenever he feels like it.
*
* The present version can be committed by "commit", but this keeps the version
* in tact.
*
* Arguments following the options are taken to be file names to be updated,
* rather than updating the entire directory.
*
* Modified or non-existent RCS files are checked out and reported as U
* <user_file>
*
* Modified user files are reported as M <user_file>. If both the RCS file and
* the user file have been modified, the user file is replaced by the result
* of rcsmerge, and a backup file is written for the user in .#file.version.
* If this throws up irreconcilable differences, the file is reported as C
* <user_file>, and as M <user_file> otherwise.
*
* Files added but not yet committed are reported as A <user_file>. Files
* removed but not yet committed are reported as R <user_file>.
*
* If the current directory contains subdirectories that hold concurrent
* versions, these are updated too. If the -d option was specified, new
* directories added to the repository are automatically created and updated
* as well.
*/
#include "cvs.h"
#include "savecwd.h"
#ifdef SERVER_SUPPORT
#include "md5.h"
#endif
#include "watch.h"
#include "fileattr.h"
#include "edit.h"
#include "getline.h"
static int checkout_file PROTO ((struct file_info *finfo, Vers_TS *vers_ts,
int adding));
#ifdef SERVER_SUPPORT
static int patch_file PROTO ((struct file_info *finfo,
Vers_TS *vers_ts,
int *docheckout, struct stat *file_info,
unsigned char *checksum));
static void patch_file_write PROTO ((void *, const char *, size_t));
#endif
static int merge_file PROTO ((struct file_info *finfo, Vers_TS *vers));
static int scratch_file PROTO((struct file_info *finfo));
static Dtype update_dirent_proc PROTO ((void *callerdat, char *dir,
char *repository, char *update_dir,
List *entries));
static int update_dirleave_proc PROTO ((void *callerdat, char *dir,
int err, char *update_dir,
List *entries));
static int update_fileproc PROTO ((void *callerdat, struct file_info *));
static int update_filesdone_proc PROTO ((void *callerdat, int err,
char *repository, char *update_dir,
List *entries));
static int write_letter PROTO((char *file, int letter, char *update_dir));
#ifdef SERVER_SUPPORT
static void join_file PROTO ((struct file_info *finfo, Vers_TS *vers_ts));
#else
static void join_file PROTO ((struct file_info *finfo, Vers_TS *vers_ts));
#endif
static char *options = NULL;
static char *tag = NULL;
static char *date = NULL;
/* This is a bit of a kludge. We call WriteTag at the beginning
before we know whether nonbranch is set or not. And then at the
end, once we have the right value for nonbranch, we call WriteTag
again. I don't know whether the first call is necessary or not.
rewrite_tag is nonzero if we are going to have to make that second
call. */
static int rewrite_tag;
static int nonbranch;
static char *join_rev1, *date_rev1;
static char *join_rev2, *date_rev2;
static int aflag = 0;
static int force_tag_match = 1;
static int update_build_dirs = 0;
static int update_prune_dirs = 0;
static int pipeout = 0;
#ifdef SERVER_SUPPORT
static int patches = 0;
static int rcs_diff_patches = 0;
#endif
static List *ignlist = (List *) NULL;
static time_t last_register_time;
static const char *const update_usage[] =
{
"Usage: %s %s [-APdflRp] [-k kopt] [-r rev|-D date] [-j rev]\n",
" [-I ign] [-W spec] [files...]\n",
"\t-A\tReset any sticky tags/date/kopts.\n",
"\t-P\tPrune empty directories.\n",
"\t-d\tBuild directories, like checkout does.\n",
"\t-f\tForce a head revision match if tag/date not found.\n",
"\t-l\tLocal directory only, no recursion.\n",
"\t-R\tProcess directories recursively.\n",
"\t-p\tSend updates to standard output (avoids stickiness).\n",
"\t-k kopt\tUse RCS kopt -k option on checkout.\n",
"\t-r rev\tUpdate using specified revision/tag (is sticky).\n",
"\t-D date\tSet date to update from (is sticky).\n",
"\t-j rev\tMerge in changes made between current revision and rev.\n",
"\t-I ign\tMore files to ignore (! to reset).\n",
"\t-W spec\tWrappers specification line.\n",
NULL
};
/*
* update is the argv,argc based front end for arg parsing
*/
int
update (argc, argv)
int argc;
char **argv;
{
int c, err;
int local = 0; /* recursive by default */
int which; /* where to look for files and dirs */
if (argc == -1)
usage (update_usage);
ign_setup ();
wrap_setup ();
/* parse the args */
optind = 1;
while ((c = getopt (argc, argv, "+ApPflRQqduk:r:D:j:I:W:")) != -1)
{
switch (c)
{
case 'A':
aflag = 1;
break;
case 'I':
ign_add (optarg, 0);
break;
case 'W':
wrap_add (optarg, 0);
break;
case 'k':
if (options)
free (options);
options = RCS_check_kflag (optarg);
break;
case 'l':
local = 1;
break;
case 'R':
local = 0;
break;
case 'Q':
case 'q':
#ifdef SERVER_SUPPORT
/* The CVS 1.5 client sends these options (in addition to
Global_option requests), so we must ignore them. */
if (!server_active)
#endif
error (1, 0,
"-q or -Q must be specified before \"%s\"",
command_name);
break;
case 'd':
update_build_dirs = 1;
break;
case 'f':
force_tag_match = 0;
break;
case 'r':
tag = optarg;
break;
case 'D':
date = Make_Date (optarg);
break;
case 'P':
update_prune_dirs = 1;
break;
case 'p':
pipeout = 1;
noexec = 1; /* so no locks will be created */
break;
case 'j':
if (join_rev2)
error (1, 0, "only two -j options can be specified");
if (join_rev1)
join_rev2 = optarg;
else
join_rev1 = optarg;
break;
case 'u':
#ifdef SERVER_SUPPORT
if (server_active)
{
patches = 1;
rcs_diff_patches = server_use_rcs_diff ();
}
else
#endif
usage (update_usage);
break;
case '?':
default:
usage (update_usage);
break;
}
}
argc -= optind;
argv += optind;
#ifdef CLIENT_SUPPORT
if (client_active)
{
int pass;
/* The first pass does the regular update. If we receive at least
one patch which failed, we do a second pass and just fetch
those files whose patches failed. */
pass = 1;
do
{
int status;
start_server ();
if (local)
send_arg("-l");
if (update_build_dirs)
send_arg("-d");
if (pipeout)
send_arg("-p");
if (!force_tag_match)
send_arg("-f");
if (aflag)
send_arg("-A");
if (update_prune_dirs)
send_arg("-P");
client_prune_dirs = update_prune_dirs;
option_with_arg ("-r", tag);
if (options && options[0] != '\0')
send_arg (options);
if (date)
client_senddate (date);
if (join_rev1)
option_with_arg ("-j", join_rev1);
if (join_rev2)
option_with_arg ("-j", join_rev2);
wrap_send ();
/* If the server supports the command "update-patches", that means
that it knows how to handle the -u argument to update, which
means to send patches instead of complete files. */
if (failed_patches == NULL)
{
#ifndef DONT_USE_PATCH
/* Systems which don't have the patch program ported to them
will want to define DONT_USE_PATCH; then CVS won't try to
invoke patch. */
if (supported_request ("update-patches"))
send_arg ("-u");
#endif
}
if (failed_patches == NULL)
{
send_file_names (argc, argv, SEND_EXPAND_WILD);
/* If noexec, probably could be setting SEND_NO_CONTENTS.
Same caveats as for "cvs status" apply. */
send_files (argc, argv, local, aflag,
update_build_dirs ? SEND_BUILD_DIRS : 0);
}
else
{
int i;
(void) printf ("%s client: refetching unpatchable files\n",
program_name);
if (toplevel_wd != NULL
&& CVS_CHDIR (toplevel_wd) < 0)
{
error (1, errno, "could not chdir to %s", toplevel_wd);
}
for (i = 0; i < failed_patches_count; i++)
(void) unlink_file (failed_patches[i]);
send_file_names (failed_patches_count, failed_patches, 0);
send_files (failed_patches_count, failed_patches, local,
aflag, update_build_dirs ? SEND_BUILD_DIRS : 0);
}
failed_patches = NULL;
failed_patches_count = 0;
send_to_server ("update\012", 0);
status = get_responses_and_close ();
/* If there are any conflicts, the server will return a
non-zero exit status. If any patches failed, we still
want to run the update again. We use a pass count to
avoid an endless loop. */
/* Notes: (1) assuming that status != 0 implies a
potential conflict is the best we can cleanly do given
the current protocol. I suppose that trying to
re-fetch in cases where there was a more serious error
is probably more or less harmless, but it isn't really
ideal. (2) it would be nice to have a testsuite case for the
conflict-and-patch-failed case. */
if (status != 0
&& (failed_patches == NULL || pass > 1))
{
return status;
}
++pass;
} while (failed_patches != NULL);
return 0;
}
#endif
if (tag != NULL)
tag_check_valid (tag, argc, argv, local, aflag, "");
if (join_rev1 != NULL)
tag_check_valid_join (join_rev1, argc, argv, local, aflag, "");
if (join_rev2 != NULL)
tag_check_valid_join (join_rev2, argc, argv, local, aflag, "");
/*
* If we are updating the entire directory (for real) and building dirs
* as we go, we make sure there is no static entries file and write the
* tag file as appropriate
*/
if (argc <= 0 && !pipeout)
{
if (update_build_dirs)
{
if (unlink_file (CVSADM_ENTSTAT) < 0 && ! existence_error (errno))
error (1, errno, "cannot remove file %s", CVSADM_ENTSTAT);
#ifdef SERVER_SUPPORT
if (server_active)
server_clear_entstat (".", Name_Repository (NULL, NULL));
#endif
}
/* keep the CVS/Tag file current with the specified arguments */
if (aflag || tag || date)
{
WriteTag ((char *) NULL, tag, date, 0,
".", Name_Repository (NULL, NULL));
rewrite_tag = 1;
nonbranch = 0;
}
}
/* look for files/dirs locally and in the repository */
which = W_LOCAL | W_REPOS;
/* look in the attic too if a tag or date is specified */
if (tag != NULL || date != NULL || joining())
which |= W_ATTIC;
/* call the command line interface */
err = do_update (argc, argv, options, tag, date, force_tag_match,
local, update_build_dirs, aflag, update_prune_dirs,
pipeout, which, join_rev1, join_rev2, (char *) NULL);
/* free the space Make_Date allocated if necessary */
if (date != NULL)
free (date);
return (err);
}
/*
* Command line interface to update (used by checkout)
*/
int
do_update (argc, argv, xoptions, xtag, xdate, xforce, local, xbuild, xaflag,
xprune, xpipeout, which, xjoin_rev1, xjoin_rev2, preload_update_dir)
int argc;
char **argv;
char *xoptions;
char *xtag;
char *xdate;
int xforce;
int local;
int xbuild;
int xaflag;
int xprune;
int xpipeout;
int which;
char *xjoin_rev1;
char *xjoin_rev2;
char *preload_update_dir;
{
int err = 0;
char *cp;
/* fill in the statics */
options = xoptions;
tag = xtag;
date = xdate;
force_tag_match = xforce;
update_build_dirs = xbuild;
aflag = xaflag;
update_prune_dirs = xprune;
pipeout = xpipeout;
/* setup the join support */
join_rev1 = xjoin_rev1;
join_rev2 = xjoin_rev2;
if (join_rev1 && (cp = strchr (join_rev1, ':')) != NULL)
{
*cp++ = '\0';
date_rev1 = Make_Date (cp);
}
else
date_rev1 = (char *) NULL;
if (join_rev2 && (cp = strchr (join_rev2, ':')) != NULL)
{
*cp++ = '\0';
date_rev2 = Make_Date (cp);
}
else
date_rev2 = (char *) NULL;
/* call the recursion processor */
err = start_recursion (update_fileproc, update_filesdone_proc,
update_dirent_proc, update_dirleave_proc, NULL,
argc, argv, local, which, aflag, 1,
preload_update_dir, 1);
/* see if we need to sleep before returning */
if (last_register_time)
{
time_t now;
(void) time (&now);
if (now == last_register_time)
sleep (1); /* to avoid time-stamp races */
}
return (err);
}
/*
* This is the callback proc for update. It is called for each file in each
* directory by the recursion code. The current directory is the local
* instantiation. file is the file name we are to operate on. update_dir is
* set to the path relative to where we started (for pretty printing).
* repository is the repository. entries and srcfiles are the pre-parsed
* entries and source control files.
*
* This routine decides what needs to be done for each file and does the
* appropriate magic for checkout
*/
static int
update_fileproc (callerdat, finfo)
void *callerdat;
struct file_info *finfo;
{
int retval;
Ctype status;
Vers_TS *vers;
int resurrecting;
resurrecting = 0;
status = Classify_File (finfo, tag, date, options, force_tag_match,
aflag, &vers, pipeout);
/* Keep track of whether TAG is a branch tag.
Note that if it is a branch tag in some files and a nonbranch tag
in others, treat it as a nonbranch tag. It is possible that case
should elicit a warning or an error. */
if (rewrite_tag
&& tag != NULL
&& finfo->rcs != NULL)
{
char *rev = RCS_getversion (finfo->rcs, tag, NULL, 1, NULL);
if (rev != NULL
&& !RCS_nodeisbranch (finfo->rcs, tag))
nonbranch = 1;
if (rev != NULL)
free (rev);
}
if (pipeout)
{
/*
* We just return success without doing anything if any of the really
* funky cases occur
*
* If there is still a valid RCS file, do a regular checkout type
* operation
*/
switch (status)
{
case T_UNKNOWN: /* unknown file was explicitly asked
* about */
case T_REMOVE_ENTRY: /* needs to be un-registered */
case T_ADDED: /* added but not committed */
retval = 0;
break;
case T_CONFLICT: /* old punt-type errors */
retval = 1;
break;
case T_UPTODATE: /* file was already up-to-date */
case T_NEEDS_MERGE: /* needs merging */
case T_MODIFIED: /* locally modified */
case T_REMOVED: /* removed but not committed */
case T_CHECKOUT: /* needs checkout */
#ifdef SERVER_SUPPORT
case T_PATCH: /* needs patch */
#endif
retval = checkout_file (finfo, vers, 0);
break;
default: /* can't ever happen :-) */
error (0, 0,
"unknown file status %d for file %s", status, finfo->file);
retval = 0;
break;
}
}
else
{
switch (status)
{
case T_UNKNOWN: /* unknown file was explicitly asked
* about */
case T_UPTODATE: /* file was already up-to-date */
retval = 0;
break;
case T_CONFLICT: /* old punt-type errors */
retval = 1;
(void) write_letter (finfo->file, 'C', finfo->update_dir);
break;
case T_NEEDS_MERGE: /* needs merging */
if (noexec)
{
retval = 1;
(void) write_letter (finfo->file, 'C', finfo->update_dir);
}
else
{
if (wrap_merge_is_copy (finfo->file))
/* Should we be warning the user that we are
* overwriting the user's copy of the file? */
retval =
checkout_file (finfo, vers, 0);
else
retval = merge_file (finfo, vers);
}
break;
case T_MODIFIED: /* locally modified */
retval = 0;
if (vers->ts_conflict)
{
char *filestamp;
int retcode;
/*
* If the timestamp has changed and no conflict indicators
* are found, it isn't a 'C' any more.
*/
#ifdef SERVER_SUPPORT
if (server_active)
retcode = vers->ts_conflict[0] != '=';
else {
filestamp = time_stamp (finfo->file);
retcode = strcmp (vers->ts_conflict, filestamp);
free (filestamp);
}
#else
filestamp = time_stamp (finfo->file);
retcode = strcmp (vers->ts_conflict, filestamp);
free (filestamp);
#endif
if (retcode)
{
/* The timestamps differ. But if there are conflict
markers print 'C' anyway. */
retcode = !file_has_markers (finfo);
}
if (!retcode)
{
(void) write_letter (finfo->file, 'C', finfo->update_dir);
retval = 1;
}
else
{
/* Reregister to clear conflict flag. */
Register (finfo->entries, finfo->file, vers->vn_rcs, vers->ts_rcs,
vers->options, vers->tag,
vers->date, (char *)0);
}
}
if (!retval)
retval = write_letter (finfo->file, 'M', finfo->update_dir);
break;
#ifdef SERVER_SUPPORT
case T_PATCH: /* needs patch */
if (patches)
{
int docheckout;
struct stat file_info;
unsigned char checksum[16];
retval = patch_file (finfo,
vers, &docheckout,
&file_info, checksum);
if (! docheckout)
{
if (server_active && retval == 0)
server_updated (finfo, vers,
(rcs_diff_patches
? SERVER_RCS_DIFF
: SERVER_PATCHED),
&file_info, checksum);
break;
}
}
/* Fall through. */
/* If we're not running as a server, just check the
file out. It's simpler and faster than starting up
two new processes (diff and patch). */
/* Fall through. */
#endif
case T_CHECKOUT: /* needs checkout */
retval = checkout_file (finfo, vers, 0);
#ifdef SERVER_SUPPORT
if (server_active && retval == 0)
server_updated (finfo, vers,
SERVER_UPDATED, (struct stat *) NULL,
(unsigned char *) NULL);
#endif
break;
case T_ADDED: /* added but not committed */
retval = write_letter (finfo->file, 'A', finfo->update_dir);
break;
case T_REMOVED: /* removed but not committed */
retval = write_letter (finfo->file, 'R', finfo->update_dir);
break;
case T_REMOVE_ENTRY: /* needs to be un-registered */
retval = scratch_file (finfo);
#ifdef SERVER_SUPPORT
if (server_active && retval == 0)
{
if (vers->ts_user == NULL)
server_scratch_entry_only ();
server_updated (finfo, vers,
SERVER_UPDATED, (struct stat *) NULL,
(unsigned char *) NULL);
}
#endif
break;
default: /* can't ever happen :-) */
error (0, 0,
"unknown file status %d for file %s", status, finfo->file);
retval = 0;
break;
}
}
/* only try to join if things have gone well thus far */
if (retval == 0 && join_rev1)
join_file (finfo, vers);
/* if this directory has an ignore list, add this file to it */
if (ignlist)
{
Node *p;
p = getnode ();
p->type = FILES;
p->key = xstrdup (finfo->file);
if (addnode (ignlist, p) != 0)
freenode (p);
}
freevers_ts (&vers);
return (retval);
}
static void update_ignproc PROTO ((char *, char *));
static void
update_ignproc (file, dir)
char *file;
char *dir;
{
(void) write_letter (file, '?', dir);
}
/* ARGSUSED */
static int
update_filesdone_proc (callerdat, err, repository, update_dir, entries)
void *callerdat;
int err;
char *repository;
char *update_dir;
List *entries;
{
if (rewrite_tag)
{
WriteTag (NULL, tag, date, nonbranch, update_dir, repository);
rewrite_tag = 0;
}
/* if this directory has an ignore list, process it then free it */
if (ignlist)
{
ignore_files (ignlist, entries, update_dir, update_ignproc);
dellist (&ignlist);
}
/* Clean up CVS admin dirs if we are export */
if (strcmp (command_name, "export") == 0)
{
/* I'm not sure the existence_error is actually possible (except
in cases where we really should print a message), but since
this code used to ignore all errors, I'll play it safe. */
if (unlink_file_dir (CVSADM) < 0 && !existence_error (errno))
error (0, errno, "cannot remove %s directory", CVSADM);
}
#ifdef SERVER_SUPPORT
else if (!server_active && !pipeout)
#else
else if (!pipeout)
#endif /* SERVER_SUPPORT */
{
/* If there is no CVS/Root file, add one */
if (!isfile (CVSADM_ROOT))
Create_Root ((char *) NULL, CVSroot_original);
}
return (err);
}
/*
* update_dirent_proc () is called back by the recursion processor before a
* sub-directory is processed for update. In this case, update_dirent proc
* will probably create the directory unless -d isn't specified and this is a
* new directory. A return code of 0 indicates the directory should be
* processed by the recursion code. A return of non-zero indicates the
* recursion code should skip this directory.
*/
static Dtype
update_dirent_proc (callerdat, dir, repository, update_dir, entries)
void *callerdat;
char *dir;
char *repository;
char *update_dir;
List *entries;
{
if (ignore_directory (update_dir))
{
/* print the warm fuzzy message */
if (!quiet)
error (0, 0, "Ignoring %s", update_dir);
return R_SKIP_ALL;
}
if (!isdir (dir))
{
/* if we aren't building dirs, blow it off */
if (!update_build_dirs)
return (R_SKIP_ALL);
if (noexec)
{
/* ignore the missing dir if -n is specified */
error (0, 0, "New directory `%s' -- ignored", dir);
return (R_SKIP_ALL);
}
else
{
/* otherwise, create the dir and appropriate adm files */
make_directory (dir);
Create_Admin (dir, update_dir, repository, tag, date,
/* This is a guess. We will rewrite it later
via WriteTag. */
0);
rewrite_tag = 1;
nonbranch = 0;
Subdir_Register (entries, (char *) NULL, dir);
}
}
/* Do we need to check noexec here? */
else if (!pipeout)
{
char *cvsadmdir;
/* The directory exists. Check to see if it has a CVS
subdirectory. */
cvsadmdir = xmalloc (strlen (dir) + 80);
strcpy (cvsadmdir, dir);
strcat (cvsadmdir, "/");
strcat (cvsadmdir, CVSADM);
if (!isdir (cvsadmdir))
{
/* We cannot successfully recurse into a directory without a CVS
subdirectory. Generally we will have already printed
"? foo". */
free (cvsadmdir);
return R_SKIP_ALL;
}
free (cvsadmdir);
}
/*
* If we are building dirs and not going to stdout, we make sure there is
* no static entries file and write the tag file as appropriate
*/
if (!pipeout)
{
if (update_build_dirs)
{
char *tmp;
tmp = xmalloc (strlen (dir) + sizeof (CVSADM_ENTSTAT) + 10);
(void) sprintf (tmp, "%s/%s", dir, CVSADM_ENTSTAT);
if (unlink_file (tmp) < 0 && ! existence_error (errno))
error (1, errno, "cannot remove file %s", tmp);
#ifdef SERVER_SUPPORT
if (server_active)
server_clear_entstat (update_dir, repository);
#endif
free (tmp);
}
/* keep the CVS/Tag file current with the specified arguments */
if (aflag || tag || date)
{
WriteTag (dir, tag, date, 0, update_dir, repository);
rewrite_tag = 1;
nonbranch = 0;
}
/* initialize the ignore list for this directory */
ignlist = getlist ();
}
/* print the warm fuzzy message */
if (!quiet)
error (0, 0, "Updating %s", update_dir);
return (R_PROCESS);
}
/*
* update_dirleave_proc () is called back by the recursion code upon leaving
* a directory. It will prune empty directories if needed and will execute
* any appropriate update programs.
*/
/* ARGSUSED */
static int
update_dirleave_proc (callerdat, dir, err, update_dir, entries)
void *callerdat;
char *dir;
int err;
char *update_dir;
List *entries;
{
FILE *fp;
/* run the update_prog if there is one */
/* FIXME: should be checking for errors from CVS_FOPEN and printing
them if not existence_error. */
if (err == 0 && !pipeout && !noexec &&
(fp = CVS_FOPEN (CVSADM_UPROG, "r")) != NULL)
{
char *cp;
char *repository;
char *line = NULL;
size_t line_allocated = 0;
repository = Name_Repository ((char *) NULL, update_dir);
if (getline (&line, &line_allocated, fp) >= 0)
{
if ((cp = strrchr (line, '\n')) != NULL)
*cp = '\0';
run_setup ("%s %s", line, repository);
cvs_output (program_name, 0);
cvs_output (" ", 1);
cvs_output (command_name, 0);
cvs_output (": Executing '", 0);
run_print (stdout);
cvs_output ("'\n", 0);
(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
}
else if (ferror (fp))
error (0, errno, "cannot read %s", CVSADM_UPROG);
else
error (0, 0, "unexpected end of file on %s", CVSADM_UPROG);
if (fclose (fp) < 0)
error (0, errno, "cannot close %s", CVSADM_UPROG);
if (line != NULL)
free (line);
free (repository);
}
if (strchr (dir, '/') == NULL)
{
/* FIXME: chdir ("..") loses with symlinks. */
/* Prune empty dirs on the way out - if necessary */
(void) CVS_CHDIR ("..");
if (update_prune_dirs && isemptydir (dir, 0))
{
/* I'm not sure the existence_error is actually possible (except
in cases where we really should print a message), but since
this code used to ignore all errors, I'll play it safe. */
if (unlink_file_dir (dir) < 0 && !existence_error (errno))
error (0, errno, "cannot remove %s directory", dir);
Subdir_Deregister (entries, (char *) NULL, dir);
}
}
return (err);
}
static int isremoved PROTO ((Node *, void *));
/* Returns 1 if the file indicated by node has been removed. */
static int
isremoved (node, closure)
Node *node;
void *closure;
{
Entnode *entdata = (Entnode*) node->data;
/* If the first character of the version is a '-', the file has been
removed. */
return (entdata->version && entdata->version[0] == '-') ? 1 : 0;
}
/* Returns 1 if the argument directory is completely empty, other than the
existence of the CVS directory entry. Zero otherwise. If MIGHT_NOT_EXIST
and the directory doesn't exist, then just return 0. */
int
isemptydir (dir, might_not_exist)
char *dir;
int might_not_exist;
{
DIR *dirp;
struct dirent *dp;
if ((dirp = CVS_OPENDIR (dir)) == NULL)
{
if (might_not_exist && existence_error (errno))
return 0;
error (0, errno, "cannot open directory %s for empty check", dir);
return (0);
}
errno = 0;
while ((dp = readdir (dirp)) != NULL)
{
if (strcmp (dp->d_name, ".") != 0
&& strcmp (dp->d_name, "..") != 0)
{
if (strcmp (dp->d_name, CVSADM) != 0)
{
/* An entry other than the CVS directory. The directory
is certainly not empty. */
(void) closedir (dirp);
return (0);
}
else
{
/* The CVS directory entry. We don't have to worry about
this unless the Entries file indicates that files have
been removed, but not committed, in this directory.
(Removing the directory would prevent people from
comitting the fact that they removed the files!) */
List *l;
int files_removed;
struct saved_cwd cwd;
if (save_cwd (&cwd))
error_exit ();
if (CVS_CHDIR (dir) < 0)
error (1, errno, "cannot change directory to %s", dir);
l = Entries_Open (0);
files_removed = walklist (l, isremoved, 0);
Entries_Close (l);
if (restore_cwd (&cwd, NULL))
error_exit ();
free_cwd (&cwd);
if (files_removed != 0)
{
/* There are files that have been removed, but not
committed! Do not consider the directory empty. */
(void) closedir (dirp);
return (0);
}
}
}
errno = 0;
}
if (errno != 0)
{
error (0, errno, "cannot read directory %s", dir);
(void) closedir (dirp);
return (0);
}
(void) closedir (dirp);
return (1);
}
/*
* scratch the Entries file entry associated with a file
*/
static int
scratch_file (finfo)
struct file_info *finfo;
{
history_write ('W', finfo->update_dir, "", finfo->file, finfo->repository);
Scratch_Entry (finfo->entries, finfo->file);
if (unlink_file (finfo->file) < 0 && ! existence_error (errno))
error (0, errno, "unable to remove %s", finfo->fullname);
return (0);
}
/*
* Check out a file.
*/
static int
checkout_file (finfo, vers_ts, adding)
struct file_info *finfo;
Vers_TS *vers_ts;
int adding;
{
char *backup;
int set_time, retval = 0;
int retcode = 0;
int status;
int file_is_dead;
/* don't screw with backup files if we're going to stdout */
if (!pipeout)
{
backup = xmalloc (strlen (finfo->file)
+ sizeof (CVSADM)
+ sizeof (CVSPREFIX)
+ 10);
(void) sprintf (backup, "%s/%s%s", CVSADM, CVSPREFIX, finfo->file);
if (isfile (finfo->file))
rename_file (finfo->file, backup);
else
/* If -f/-t wrappers are being used to wrap up a directory,
then backup might be a directory instead of just a file. */
(void) unlink_file_dir (backup);
}
file_is_dead = RCS_isdead (vers_ts->srcfile, vers_ts->vn_rcs);
if (!file_is_dead)
{
/*
* if we are checking out to stdout, print a nice message to
* stderr, and add the -p flag to the command */
if (pipeout)
{
if (!quiet)
{
cvs_outerr ("\
===================================================================\n\
Checking out ", 0);
cvs_outerr (finfo->fullname, 0);
cvs_outerr ("\n\
RCS: ", 0);
cvs_outerr (vers_ts->srcfile->path, 0);
cvs_outerr ("\n\
VERS: ", 0);
cvs_outerr (vers_ts->vn_rcs, 0);
cvs_outerr ("\n***************\n", 0);
}
}
status = RCS_checkout (vers_ts->srcfile,
pipeout ? NULL : finfo->file,
vers_ts->vn_rcs, vers_ts->vn_tag,
vers_ts->options, RUN_TTY,
(RCSCHECKOUTPROC) NULL, (void *) NULL);
}
if (file_is_dead || status == 0)
{
if (!pipeout)
{
Vers_TS *xvers_ts;
if (cvswrite == TRUE
&& !file_is_dead
&& !fileattr_get (finfo->file, "_watched"))
xchmod (finfo->file, 1);
{
/* A newly checked out file is never under the spell
of "cvs edit". If we think we were editing it
from a previous life, clean up. Would be better to
check for same the working directory instead of
same user, but that is hairy. */
struct addremove_args args;
editor_set (finfo->file, getcaller (), NULL);
memset (&args, 0, sizeof args);
args.remove_temp = 1;
watch_modify_watchers (finfo->file, &args);
}
/* set the time from the RCS file iff it was unknown before */
if (vers_ts->vn_user == NULL ||
strncmp (vers_ts->ts_rcs, "Initial", 7) == 0)
{
set_time = 1;
}
else
set_time = 0;
wrap_fromcvs_process_file (finfo->file);
xvers_ts = Version_TS (finfo, options, tag, date,
force_tag_match, set_time);
if (strcmp (xvers_ts->options, "-V4") == 0)
xvers_ts->options[0] = '\0';
(void) time (&last_register_time);
if (file_is_dead)
{
if (xvers_ts->vn_user != NULL)
{
error (0, 0,
"warning: %s is not (any longer) pertinent",
finfo->fullname);
}
Scratch_Entry (finfo->entries, finfo->file);
#ifdef SERVER_SUPPORT
if (server_active && xvers_ts->ts_user == NULL)
server_scratch_entry_only ();
#endif
/* FIXME: Rather than always unlink'ing, and ignoring the
existence_error, we should do the unlink only if
vers_ts->ts_user is non-NULL. Then there would be no
need to ignore an existence_error (for example, if the
user removes the file while we are running). */
if (unlink_file (finfo->file) < 0 && ! existence_error (errno))
{
error (0, errno, "cannot remove %s", finfo->fullname);
}
}
else
Register (finfo->entries, finfo->file,
adding ? "0" : xvers_ts->vn_rcs,
xvers_ts->ts_user, xvers_ts->options,
xvers_ts->tag, xvers_ts->date,
(char *)0); /* Clear conflict flag on fresh checkout */
/* fix up the vers structure, in case it is used by join */
if (join_rev1)
{
if (vers_ts->vn_user != NULL)
free (vers_ts->vn_user);
if (vers_ts->vn_rcs != NULL)
free (vers_ts->vn_rcs);
vers_ts->vn_user = xstrdup (xvers_ts->vn_rcs);
vers_ts->vn_rcs = xstrdup (xvers_ts->vn_rcs);
}
/* If this is really Update and not Checkout, recode history */
if (strcmp (command_name, "update") == 0)
history_write ('U', finfo->update_dir, xvers_ts->vn_rcs, finfo->file,
finfo->repository);
freevers_ts (&xvers_ts);
if (!really_quiet && !file_is_dead)
{
write_letter (finfo->file, 'U', finfo->update_dir);
}
}
}
else
{
int old_errno = errno; /* save errno value over the rename */
if (!pipeout && isfile (backup))
rename_file (backup, finfo->file);
error (retcode == -1 ? 1 : 0, retcode == -1 ? old_errno : 0,
"could not check out %s", finfo->fullname);
retval = retcode;
}
if (!pipeout)
{
/* If -f/-t wrappers are being used to wrap up a directory,
then backup might be a directory instead of just a file. */
(void) unlink_file_dir (backup);
free (backup);
}
return (retval);
}
#ifdef SERVER_SUPPORT
/* This structure is used to pass information between patch_file and
patch_file_write. */
struct patch_file_data
{
/* File name, for error messages. */
const char *filename;
/* File to which to write. */
FILE *fp;
/* Whether to compute the MD5 checksum. */
int compute_checksum;
/* Data structure for computing the MD5 checksum. */
struct MD5Context context;
/* Set if the file has a final newline. */
int final_nl;
};
/* Patch a file. Runs diff. This is only done when running as the
* server. The hope is that the diff will be smaller than the file
* itself.
*/
static int
patch_file (finfo, vers_ts, docheckout, file_info, checksum)
struct file_info *finfo;
Vers_TS *vers_ts;
int *docheckout;
struct stat *file_info;
unsigned char *checksum;
{
char *backup;
char *file1;
char *file2;
int retval = 0;
int retcode = 0;
int fail;
FILE *e;
struct patch_file_data data;
*docheckout = 0;
if (noexec || pipeout || joining ())
{
*docheckout = 1;
return 0;
}
/* If this file has been marked as being binary, then never send a
patch. */
if (strcmp (vers_ts->options, "-kb") == 0)
{
*docheckout = 1;
return 0;
}
backup = xmalloc (strlen (finfo->file)
+ sizeof (CVSADM)
+ sizeof (CVSPREFIX)
+ 10);
(void) sprintf (backup, "%s/%s%s", CVSADM, CVSPREFIX, finfo->file);
if (isfile (finfo->file))
rename_file (finfo->file, backup);
else
(void) unlink_file (backup);
file1 = xmalloc (strlen (finfo->file)
+ sizeof (CVSADM)
+ sizeof (CVSPREFIX)
+ 10);
(void) sprintf (file1, "%s/%s%s-1", CVSADM, CVSPREFIX, finfo->file);
file2 = xmalloc (strlen (finfo->file)
+ sizeof (CVSADM)
+ sizeof (CVSPREFIX)
+ 10);
(void) sprintf (file2, "%s/%s%s-2", CVSADM, CVSPREFIX, finfo->file);
fail = 0;
/* We need to check out both revisions first, to see if either one
has a trailing newline. Because of this, we don't use rcsdiff,
but just use diff. */
e = CVS_FOPEN (file1, "w");
if (e == NULL)
error (1, errno, "cannot open %s", file1);
data.filename = file1;
data.fp = e;
data.final_nl = 0;
data.compute_checksum = 0;
retcode = RCS_checkout (vers_ts->srcfile, (char *) NULL,
vers_ts->vn_user, (char *) NULL,
vers_ts->options, RUN_TTY,
patch_file_write, (void *) &data);
if (fclose (e) < 0)
error (1, errno, "cannot close %s", file1);
if (retcode != 0 || ! data.final_nl)
fail = 1;
if (! fail)
{
e = CVS_FOPEN (file2, "w");
if (e == NULL)
error (1, errno, "cannot open %s", file2);
data.filename = file2;
data.fp = e;
data.final_nl = 0;
data.compute_checksum = 1;
MD5Init (&data.context);
retcode = RCS_checkout (vers_ts->srcfile, (char *) NULL,
vers_ts->vn_rcs, (char *) NULL,
vers_ts->options, RUN_TTY,
patch_file_write, (void *) &data);
if (fclose (e) < 0)
error (1, errno, "cannot close %s", file2);
if (retcode != 0 || ! data.final_nl)
fail = 1;
else
MD5Final (checksum, &data.context);
}
retcode = 0;
if (! fail)
{
const char *diff_options;
/* FIXME: It might be better to come up with a diff library
which can be shared with the diffutils. */
/* If the client does not support the Rcs-diff command, we
send a context diff, and the client must invoke patch.
That approach was problematical for various reasons. The
new approach only requires running diff in the server; the
client can handle everything without invoking an external
program. */
if (! rcs_diff_patches)
{
/* We use -c, not -u, because we have no way of knowing
which DIFF is in use. */
diff_options = "-c";
}
else
{
/* FIXME: We should use -a if diff supports it. We should
probably just copy over most or all of the diff
handling in the RCS configure script. */
/* IMHO, we shouldn't copy over anything which even
vaguely resembles the RCS configure script. That kind of
thing tends to be ugly, slow, and fragile. It also is a
a support headache for CVS to behave differently in subtle
ways based on whether it was installed correctly. Instead we
should come up with a diff library. -kingdon, Apr 1997. */
diff_options = "-n";
}
run_setup ("%s %s %s %s", DIFF, diff_options, file1, file2);
/* A retcode of 0 means no differences. 1 means some differences. */
if ((retcode = run_exec (RUN_TTY, finfo->file, RUN_TTY, RUN_NORMAL)) != 0
&& retcode != 1)
{
fail = 1;
}
else
{
#define BINARY "Binary"
char buf[sizeof BINARY];
unsigned int c;
/* Stat the original RCS file, and then adjust it the way
that RCS_checkout would. FIXME: This is an abstraction
violation. */
if (CVS_STAT (vers_ts->srcfile->path, file_info) < 0)
error (1, errno, "could not stat %s", vers_ts->srcfile->path);
if (chmod (finfo->file,
file_info->st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH))
< 0)
error (0, errno, "cannot change mode of file %s", finfo->file);
if (cvswrite == TRUE
&& !fileattr_get (finfo->file, "_watched"))
xchmod (finfo->file, 1);
/* Check the diff output to make sure patch will be handle it. */
e = CVS_FOPEN (finfo->file, "r");
if (e == NULL)
error (1, errno, "could not open diff output file %s",
finfo->fullname);
c = fread (buf, 1, sizeof BINARY - 1, e);
buf[c] = '\0';
if (strcmp (buf, BINARY) == 0)
{
/* These are binary files. We could use diff -a, but
patch can't handle that. */
fail = 1;
}
fclose (e);
}
}
if (! fail)
{
Vers_TS *xvers_ts;
/* This stuff is just copied blindly from checkout_file. I
don't really know what it does. */
xvers_ts = Version_TS (finfo, options, tag, date,
force_tag_match, 0);
if (strcmp (xvers_ts->options, "-V4") == 0)
xvers_ts->options[0] = '\0';
Register (finfo->entries, finfo->file, xvers_ts->vn_rcs,
xvers_ts->ts_user, xvers_ts->options,
xvers_ts->tag, xvers_ts->date, NULL);
if (CVS_STAT (finfo->file, file_info) < 0)
error (1, errno, "could not stat %s", finfo->file);
/* If this is really Update and not Checkout, recode history */
if (strcmp (command_name, "update") == 0)
history_write ('P', finfo->update_dir, xvers_ts->vn_rcs, finfo->file,
finfo->repository);
freevers_ts (&xvers_ts);
if (!really_quiet)
{
write_letter (finfo->file, 'P', finfo->update_dir);
}
}
else
{
int old_errno = errno; /* save errno value over the rename */
if (isfile (backup))
rename_file (backup, finfo->file);
if (retcode != 0 && retcode != 1)
error (retcode == -1 ? 1 : 0, retcode == -1 ? old_errno : 0,
"could not diff %s", finfo->fullname);
*docheckout = 1;
retval = retcode;
}
(void) unlink_file (backup);
(void) unlink_file (file1);
(void) unlink_file (file2);
free (backup);
free (file1);
free (file2);
return (retval);
}
/* Write data to a file. Record whether the last byte written was a
newline. Optionally compute a checksum. This is called by
patch_file via RCS_checkout. */
static void
patch_file_write (callerdat, buffer, len)
void *callerdat;
const char *buffer;
size_t len;
{
struct patch_file_data *data = (struct patch_file_data *) callerdat;
if (fwrite (buffer, 1, len, data->fp) != len)
error (1, errno, "cannot write %s", data->filename);
data->final_nl = (buffer[len - 1] == '\n');
if (data->compute_checksum)
MD5Update (&data->context, buffer, len);
}
#endif /* SERVER_SUPPORT */
/*
* Several of the types we process only print a bit of information consisting
* of a single letter and the name.
*/
static int
write_letter (file, letter, update_dir)
char *file;
int letter;
char *update_dir;
{
if (!really_quiet)
{
char buf[2];
buf[0] = letter;
buf[1] = ' ';
cvs_output (buf, 2);
if (update_dir[0])
{
cvs_output (update_dir, 0);
cvs_output ("/", 1);
}
cvs_output (file, 0);
cvs_output ("\n", 1);
}
return (0);
}
/*
* Do all the magic associated with a file which needs to be merged
*/
static int
merge_file (finfo, vers)
struct file_info *finfo;
Vers_TS *vers;
{
char *backup;
int status;
int retcode = 0;
int retval;
/*
* The users currently modified file is moved to a backup file name
* ".#filename.version", so that it will stay around for a few days
* before being automatically removed by some cron daemon. The "version"
* is the version of the file that the user was most up-to-date with
* before the merge.
*/
backup = xmalloc (strlen (finfo->file)
+ strlen (vers->vn_user)
+ sizeof (BAKPREFIX)
+ 10);
(void) sprintf (backup, "%s%s.%s", BAKPREFIX, finfo->file, vers->vn_user);
(void) unlink_file (backup);
copy_file (finfo->file, backup);
xchmod (finfo->file, 1);
if (strcmp (vers->options, "-kb") == 0)
{
/* For binary files, a merge is always a conflict. We give the
user the two files, and let them resolve it. It is possible
that we should require a "touch foo" or similar step before
we allow a checkin. */
status = checkout_file (finfo, vers, 0);
#ifdef SERVER_SUPPORT
/* Send the new contents of the file before the message. If we
wanted to be totally correct, we would have the client write
the message only after the file has safely been written. */
if (server_active)
{
server_copy_file (finfo->file, finfo->update_dir,
finfo->repository, backup);
server_updated (finfo, vers, SERVER_MERGED,
(struct stat *) NULL, (unsigned char *) NULL);
}
#endif
error (0, 0, "binary file needs merge");
error (0, 0, "revision %s from repository is now in %s",
vers->vn_rcs, finfo->fullname);
error (0, 0, "file from working directory is now in %s", backup);
write_letter (finfo->file, 'C', finfo->update_dir);
history_write ('C', finfo->update_dir, vers->vn_rcs, finfo->file,
finfo->repository);
retval = 0;
goto out;
}
status = RCS_merge(vers->srcfile->path,
vers->options, vers->vn_user, vers->vn_rcs);
if (status != 0 && status != 1)
{
error (0, status == -1 ? errno : 0,
"could not merge revision %s of %s", vers->vn_user, finfo->fullname);
error (status == -1 ? 1 : 0, 0, "restoring %s from backup file %s",
finfo->fullname, backup);
rename_file (backup, finfo->file);
retval = 1;
goto out;
}
if (strcmp (vers->options, "-V4") == 0)
vers->options[0] = '\0';
(void) time (&last_register_time);
{
char *cp = 0;
if (status)
cp = time_stamp (finfo->file);
Register (finfo->entries, finfo->file, vers->vn_rcs, vers->ts_rcs, vers->options,
vers->tag, vers->date, cp);
if (cp)
free (cp);
}
/* fix up the vers structure, in case it is used by join */
if (join_rev1)
{
if (vers->vn_user != NULL)
free (vers->vn_user);
vers->vn_user = xstrdup (vers->vn_rcs);
}
#ifdef SERVER_SUPPORT
/* Send the new contents of the file before the message. If we
wanted to be totally correct, we would have the client write
the message only after the file has safely been written. */
if (server_active)
{
server_copy_file (finfo->file, finfo->update_dir, finfo->repository,
backup);
server_updated (finfo, vers, SERVER_MERGED,
(struct stat *) NULL, (unsigned char *) NULL);
}
#endif
if (!noexec && !xcmp (backup, finfo->file))
{
printf ("%s already contains the differences between %s and %s\n",
finfo->fullname, vers->vn_user, vers->vn_rcs);
history_write ('G', finfo->update_dir, vers->vn_rcs, finfo->file,
finfo->repository);
retval = 0;
goto out;
}
if (status == 1)
{
if (!noexec)
error (0, 0, "conflicts found in %s", finfo->fullname);
write_letter (finfo->file, 'C', finfo->update_dir);
history_write ('C', finfo->update_dir, vers->vn_rcs, finfo->file, finfo->repository);
}
else if (retcode == -1)
{
error (1, errno, "fork failed while examining update of %s",
finfo->fullname);
}
else
{
write_letter (finfo->file, 'M', finfo->update_dir);
history_write ('G', finfo->update_dir, vers->vn_rcs, finfo->file,
finfo->repository);
}
retval = 0;
out:
free (backup);
return retval;
}
/*
* Do all the magic associated with a file which needs to be joined
* (-j option)
*/
static void
join_file (finfo, vers)
struct file_info *finfo;
Vers_TS *vers;
{
char *backup;
char *options;
int status;
char *rev1;
char *rev2;
char *jrev1;
char *jrev2;
char *jdate1;
char *jdate2;
jrev1 = join_rev1;
jrev2 = join_rev2;
jdate1 = date_rev1;
jdate2 = date_rev2;
if (wrap_merge_is_copy (finfo->file))
{
error (0, 0,
"Cannot merge %s because it is a merge-by-copy file.",
finfo->fullname);
return;
}
/* Determine if we need to do anything at all. */
if (vers->srcfile == NULL ||
vers->srcfile->path == NULL)
{
return;
}
/* If only one join revision is specified, it becomes the second
revision. */
if (jrev2 == NULL)
{
jrev2 = jrev1;
jrev1 = NULL;
jdate2 = jdate1;
jdate1 = NULL;
}
/* Convert the second revision, walking branches and dates. */
rev2 = RCS_getversion (vers->srcfile, jrev2, jdate2, 1, (int *) NULL);
/* If this is a merge of two revisions, get the first revision.
If only one join tag was specified, then the first revision is
the greatest common ancestor of the second revision and the
working file. */
if (jrev1 != NULL)
rev1 = RCS_getversion (vers->srcfile, jrev1, jdate1, 1, (int *) NULL);
else
{
/* Note that we use vn_rcs here, since vn_user may contain a
special string such as "-nn". */
if (vers->vn_rcs == NULL)
rev1 = NULL;
else if (rev2 == NULL)
{
/* This means that the file never existed on the branch.
It does not mean that the file was removed on the
branch: that case is represented by a dead rev2. If
the file never existed on the branch, then we have
nothing to merge, so we just return. */
return;
}
else
rev1 = gca (vers->vn_rcs, rev2);
}
/* Handle a nonexistent or dead merge target. */
if (rev2 == NULL || RCS_isdead (vers->srcfile, rev2))
{
char *mrev;
if (rev2 != NULL)
free (rev2);
/* If the first revision doesn't exist either, then there is
no change between the two revisions, so we don't do
anything. */
if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
{
if (rev1 != NULL)
free (rev1);
return;
}
/* If we are merging two revisions, then the file was removed
between the first revision and the second one. In this
case we want to mark the file for removal.
If we are merging one revision, then the file has been
removed between the greatest common ancestor and the merge
revision. From the perspective of the branch on to which
we ar emerging, which may be the trunk, either 1) the file
does not currently exist on the target, or 2) the file has
not been modified on the target branch since the greatest
common ancestor, or 3) the file has been modified on the
target branch since the greatest common ancestor. In case
1 there is nothing to do. In case 2 we mark the file for
removal. In case 3 we have a conflict.
Note that the handling is slightly different depending upon
whether one or two join targets were specified. If two
join targets were specified, we don't check whether the
file was modified since a given point. My reasoning is
that if you ask for an explicit merge between two tags,
then you want to merge in whatever was changed between
those two tags. If a file was removed between the two
tags, then you want it to be removed. However, if you ask
for a merge of a branch, then you want to merge in all
changes which were made on the branch. If a file was
removed on the branch, that is a change to the file. If
the file was also changed on the main line, then that is
also a change. These two changes--the file removal and the
modification--must be merged. This is a conflict. */
/* If the user file is dead, or does not exist, or has been
marked for removal, then there is nothing to do. */
if (vers->vn_user == NULL
|| vers->vn_user[0] == '-'
|| RCS_isdead (vers->srcfile, vers->vn_user))
{
if (rev1 != NULL)
free (rev1);
return;
}
/* If the user file has been marked for addition, or has been
locally modified, then we have a conflict which we can not
resolve. No_Difference will already have been called in
this case, so comparing the timestamps is sufficient to
determine whether the file is locally modified. */
if (strcmp (vers->vn_user, "0") == 0
|| (vers->ts_user != NULL
&& strcmp (vers->ts_user, vers->ts_rcs) != 0))
{
if (jdate2 != NULL)
error (0, 0,
"file %s is locally modified, but has been removed in revision %s as of %s",
finfo->fullname, jrev2, jdate2);
else
error (0, 0,
"file %s is locally modified, but has been removed in revision %s",
finfo->fullname, jrev2);
/* FIXME: Should we arrange to return a non-zero exit
status? */
if (rev1 != NULL)
free (rev1);
return;
}
/* If only one join tag was specified, and the user file has
been changed since the greatest common ancestor (rev1),
then there is a conflict we can not resolve. See above for
the rationale. */
if (join_rev2 == NULL
&& strcmp (rev1, vers->vn_user) != 0)
{
if (jdate2 != NULL)
error (0, 0,
"file %s has been modified, but has been removed in revision %s as of %s",
finfo->fullname, jrev2, jdate2);
else
error (0, 0,
"file %s has been modified, but has been removed in revision %s",
finfo->fullname, jrev2);
/* FIXME: Should we arrange to return a non-zero exit
status? */
if (rev1 != NULL)
free (rev1);
return;
}
if (rev1 != NULL)
free (rev1);
/* The user file exists and has not been modified. Mark it
for removal. FIXME: If we are doing a checkout, this has
the effect of first checking out the file, and then
removing it. It would be better to just register the
removal. */
#ifdef SERVER_SUPPORT
if (server_active)
{
server_scratch (finfo->file);
server_updated (finfo, vers, SERVER_UPDATED, (struct stat *) NULL,
(unsigned char *) NULL);
}
#endif
mrev = xmalloc (strlen (vers->vn_user) + 2);
sprintf (mrev, "-%s", vers->vn_user);
Register (finfo->entries, finfo->file, mrev, vers->ts_rcs,
vers->options, vers->tag, vers->date, vers->ts_conflict);
free (mrev);
/* We need to check existence_error here because if we are
running as the server, and the file is up to date in the
working directory, the client will not have sent us a copy. */
if (unlink_file (finfo->file) < 0 && ! existence_error (errno))
error (0, errno, "cannot remove file %s", finfo->fullname);
#ifdef SERVER_SUPPORT
if (server_active)
server_checked_in (finfo->file, finfo->update_dir,
finfo->repository);
#endif
if (! really_quiet)
error (0, 0, "scheduling %s for removal", finfo->fullname);
return;
}
/* If the target of the merge is the same as the working file
revision, then there is nothing to do. */
if (vers->vn_user != NULL && strcmp (rev2, vers->vn_user) == 0)
{
if (rev1 != NULL)
free (rev1);
free (rev2);
return;
}
/* If rev1 is dead or does not exist, then the file was added
between rev1 and rev2. */
if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
{
if (rev1 != NULL)
free (rev1);
free (rev2);
/* If the file does not exist in the working directory, then
we can just check out the new revision and mark it for
addition. */
if (vers->vn_user == NULL)
{
Vers_TS *xvers;
xvers = Version_TS (finfo, vers->options, jrev2, jdate2, 1, 0);
/* FIXME: If checkout_file fails, we should arrange to
return a non-zero exit status. */
status = checkout_file (finfo, xvers, 1);
#ifdef SERVER_SUPPORT
if (server_active && status == 0)
server_updated (finfo, xvers,
SERVER_UPDATED, (struct stat *) NULL,
(unsigned char *) NULL);
#endif
freevers_ts (&xvers);
return;
}
/* The file currently exists in the working directory, so we
have a conflict which we can not resolve. Note that this
is true even if the file is marked for addition or removal. */
if (jdate2 != NULL)
error (0, 0,
"file %s exists, but has been added in revision %s as of %s",
finfo->fullname, jrev2, jdate2);
else
error (0, 0,
"file %s exists, but has been added in revision %s",
finfo->fullname, jrev2);
return;
}
/* If the two merge revisions are the same, then there is nothing
to do. */
if (strcmp (rev1, rev2) == 0)
{
free (rev1);
free (rev2);
return;
}
/* If there is no working file, then we can't do the merge. */
if (vers->vn_user == NULL)
{
free (rev1);
free (rev2);
if (jdate2 != NULL)
error (0, 0,
"file %s is present in revision %s as of %s",
finfo->fullname, jrev2, jdate2);
else
error (0, 0,
"file %s is present in revision %s",
finfo->fullname, jrev2);
/* FIXME: Should we arrange to return a non-zero exit status? */
return;
}
#ifdef SERVER_SUPPORT
if (server_active && !isreadable (finfo->file))
{
int retcode;
/* The file is up to date. Need to check out the current contents. */
retcode = RCS_checkout (vers->srcfile, finfo->file,
vers->vn_user, (char *) NULL,
(char *) NULL, RUN_TTY,
(RCSCHECKOUTPROC) NULL, (void *) NULL);
if (retcode != 0)
error (1, retcode == -1 ? errno : 0,
"failed to check out %s file", finfo->fullname);
}
#endif
/*
* The users currently modified file is moved to a backup file name
* ".#filename.version", so that it will stay around for a few days
* before being automatically removed by some cron daemon. The "version"
* is the version of the file that the user was most up-to-date with
* before the merge.
*/
backup = xmalloc (strlen (finfo->file)
+ strlen (vers->vn_user)
+ sizeof (BAKPREFIX)
+ 10);
(void) sprintf (backup, "%s%s.%s", BAKPREFIX, finfo->file, vers->vn_user);
(void) unlink_file (backup);
copy_file (finfo->file, backup);
xchmod (finfo->file, 1);
options = vers->options;
#ifdef HAVE_RCS5
#if 0
if (*options == '\0')
options = "-kk"; /* to ignore keyword expansions */
#endif
#endif
status = RCS_merge (vers->srcfile->path, options, rev1, rev2);
if (status != 0 && status != 1)
{
error (0, status == -1 ? errno : 0,
"could not merge revision %s of %s", rev2, finfo->fullname);
error (status == -1 ? 1 : 0, 0, "restoring %s from backup file %s",
finfo->fullname, backup);
rename_file (backup, finfo->file);
}
free (rev1);
free (rev2);
#ifdef SERVER_SUPPORT
/*
* If we're in server mode, then we need to re-register the file
* even if there were no conflicts (status == 0).
* This tells server_updated() to send the modified file back to
* the client.
*/
if (status == 1 || (status == 0 && server_active))
#else
if (status == 1)
#endif
{
char *cp = 0;
if (status)
cp = time_stamp (finfo->file);
Register (finfo->entries, finfo->file,
vers->vn_rcs, vers->ts_rcs, vers->options,
vers->tag, vers->date, cp);
if (cp)
free(cp);
}
#ifdef SERVER_SUPPORT
if (server_active)
{
server_copy_file (finfo->file, finfo->update_dir, finfo->repository,
backup);
server_updated (finfo, vers, SERVER_MERGED,
(struct stat *) NULL, (unsigned char *) NULL);
}
#endif
free (backup);
}
int
joining ()
{
return (join_rev1 != NULL);
}
|