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
|
#!/usr/local/bin/perl
use Config;
use File::Basename qw(&basename &dirname);
# List explicitly here the variables you want Configure to
# generate. Metaconfig only looks for shell variables, so you
# have to mention them as if they were shell variables, not
# %Config entries. Thus you write
# $startperl
# to ensure Configure will look for $Config{startperl}.
# This forces PL files to create target in same directory as PL file.
# This is so that make depend always knows where to find PL derivatives.
chdir(dirname($0));
($file = basename($0)) =~ s/\.PL$//;
$file =~ s/\.pl$//
if ($^O eq 'VMS' or $^O eq 'os2'); # "case-forgiving"
open OUT,">$file" or die "Can't create $file: $!";
print "Extracting $file (with variable substitutions)\n";
# In this section, perl variables will be expanded during extraction.
# You can use $Config{...} to use Configure variables.
print OUT <<"!GROK!THIS!";
$Config{'startperl'}
!GROK!THIS!
print OUT <<'!NO!SUBS!';
# makepatch.pl -- generate batch of patches.
my $RCS_Id = '$Id: makepatch.pl,v 1.93 1998-10-04 16:19:40+02 jv Exp $ ';
# Author : Johan Vromans
# Created On : Tue Jul 7 20:39:39 1992
# Last Modified By: Johan Vromans
# Last Modified On: Sun Oct 4 16:15:52 1998
# Update Count : 394
# Status : Experimental
#
# Generate a patch kit from two files or directories.
use strict;
use Getopt::Long 2.00;
use IO;
################ Common stuff ################
# $LIBDIR = $ENV{'LIBDIR'} || '/usr/local/lib/sample';
# unshift (@INC, $LIBDIR);
# require 'common.pl';
my $my_package = 'Sciurix';
my ($my_name, $my_version) = $RCS_Id =~ /: (.+).pl,v ([\d.]+)/;
$my_version = sprintf ("%d.%02d", $1, $2)
if $my_version =~ /^(\d+)\.(\d+)$/;
$my_version .= '*' if length('$Locker: $ ') > 12;
$my_version .= " (2.0BETA)";
################ Globals ################
## Options and defaults
my $opt_generate = 'shell'; # style of output
my $opt_diff = 'diff -c'; # diff command
my $opt_sort; # sort entries. Default = 1
my $opt_follow = 0; # follow symbolic links
my $opt_fixpath = 0; # fix pathnames for buggy diff/patch
my $opt_fixallpath = 0; # more fixes
my $opt_oldmanifest; # list of files of the old tree
my $opt_newmanifest; # list of files of the new tree
my $opt_patchlevel; # patchlevel.h file
my $opt_prefix = ''; # prefix to be added
my $opt_filelist = 0; # make file list
my $opt_infocmd; # info command
my $opt_exclude_vc = 0; # exclude VC files
my @opt_exclude; # list of excludes (wildcards)
my @opt_exclude_regex; # list of excludes (regex)
my $opt_recurse = 1; # recurse
my $opt_trace = 0; # trace messages
my $opt_verbose = 1; # verbose info
my $opt_debug = 0; # debugging messages
## Misc
my @goners = (); # files removed
my %newcomers = (); # files added
my $patched = 0; # files patched
my $created = 0; # files created
my $exclude_pat; # regex to exclude
my @checkfiles = (); # for verification
## Subroutines
sub app_options ();
sub app_usage ();
sub debug (@);
sub dodiff ($$$$$);
sub doit ($$);
sub domanifest ($);
sub make_filelist ($;$$);
sub trace (@);
sub verbose (@);
sub wrapup (;$);
################ Program parameters ################
app_options ();
################ The Process ################
my ($old, $new) = @ARGV;
# Add --exclude wildcards to --exclude-regex list.
if ( @opt_exclude ) {
my $pat;
foreach $pat ( @opt_exclude ) {
my @a = split (/(\[[^\]]+\]|[*.?])/, $pat);
push (@opt_exclude_regex,
join ('',
'(\A|/)',
(map { ($_ eq '*' ? '.*' :
($_ eq '?' ? '.' :
($_ eq '.' ? '\.' :
($_ =~ /^\[/ ? $_ : quotemeta ($_)))))
} @a),
'\Z'));
}
}
# Build regex from --exclude-regex list.
if ( @opt_exclude_regex ) {
$exclude_pat = '(';
my $re;
foreach $re ( @opt_exclude_regex ) {
verbose (" Exclude regex: ", $re, "\n");
eval { '' =~ /$re/ };
if ( $@ ) {
$@ =~ s/ at .* line.*$//;
die ("Invalid regex: $re $@");
}
$exclude_pat .= "($re)|";
}
chop ($exclude_pat);
$exclude_pat .= ')';
debug ("Exclude pattern: $exclude_pat\n");
}
# Handle --filelist.
if ( $opt_filelist ) {
my @new = domanifest (shift (@ARGV));
foreach ( @new ) {
print STDOUT ($opt_prefix, $_, "\n");
}
exit (0);
}
# Create temp files.
chomp(my $thepatch = `tempfile`);
chomp(my $tmpfile = `tempfile`) if $? == 0;
if ($? != 0) {
# Setting $! works around the $? % 256 bug
$! = 1;
die "$0: Return $? from tempfile\n";
}
open (PATCH, ">$thepatch") || die ("$thepatch: $!\n");
# The process.
doit ($old, $new);
wrapup ();
exit (0);
################ Subroutines ################
sub verbose (@) { print STDERR (@_) if $opt_verbose; }
sub debug (@) { print STDERR (@_) if $opt_debug; }
sub trace (@) { print STDERR (@_) if $opt_trace; }
sub doit ($$) {
my ($old, $new) = @_;
if ( -f $old && -f $new ) {
# Two files.
verbose ("Old file = $old.\n", "New file = $new.\n");
dodiff ("", $old, "", $new, 0);
push (@checkfiles, [ $old, -s $old ]);
}
elsif ( -f $old && -d $new ) {
# File and dir -> File and dir/File.
$new = ( $new =~ m|^\./?$| ) ? "" : "$new/";
verbose ("Old file = $old.\n", "New file = $new$old.\n");
dodiff ("", $old, $new, $old, $opt_fixallpath);
push (@checkfiles, [ $old, -s $old ]);
}
elsif ( -f $new && -d $old ) {
$old = ( $old =~ m|^\./?$| ) ? "" : "$old/";
verbose ("Old file = $old$new.\n", "New file = $new.\n");
dodiff ($old, $new, "", $new, $opt_fixallpath);
push (@checkfiles, [ $old.$new, -s $old.$new ]);
}
else {
# Should be two directories.
my (@old, @new);
if ( defined $opt_oldmanifest ) {
@old = domanifest ($opt_oldmanifest);
}
else {
@old = make_filelist ($old);
}
if ( defined $opt_newmanifest ) {
@new = domanifest ($opt_newmanifest);
}
else {
@new = make_filelist ($new);
}
$new = ( $new =~ m|^\./?$| ) ? "" : "$new/";
$old = ( $old =~ m|^\./?$| ) ? "" : "$old/";
if ( $opt_verbose ) {
my ($oldstr) = $old; chomp ($oldstr);
my ($newstr) = $new; chomp ($newstr);
verbose ("Old dir = $oldstr, file list = ",
defined $opt_oldmanifest ? $opt_oldmanifest : "<*>",
", ", scalar(@old), " files.\n",
"New dir = $newstr, file list = ",
defined $opt_newmanifest ? $opt_newmanifest : "<*>",
", ", scalar(@new), " files.\n");
}
# Handle patchlevel file first.
$opt_patchlevel = (grep (/patchlevel\.h/, @new))[0]
unless defined $opt_patchlevel;
if ( defined $opt_patchlevel && $opt_patchlevel ne "" ) {
if ( ! -f "$new$opt_patchlevel" ) {
die ("$new$opt_patchlevel: $!\n");
}
if ( -f "$old$opt_patchlevel" ) {
dodiff ($old, $opt_patchlevel, $new, $opt_patchlevel,
$opt_fixallpath);
push (@checkfiles, [ $old.$opt_patchlevel,
-s $old.$opt_patchlevel ]);
}
else {
$created++;
dodiff ("", "/dev/null", $new, $opt_patchlevel,
$opt_fixpath);
}
}
else {
undef $opt_patchlevel;
}
foreach ( $old[0], $old[-1] ) {
push (@checkfiles, [ $old.$_, -s $old.$_ ]);
}
my $o;
my $n;
# Process the filelists.
while ( @old + @new ) {
$o = shift (@old) unless defined $o;
$n = shift (@new) unless defined $n;
if ( defined $n && (!defined $o || $o gt $n) ) {
# New file.
if ( defined $opt_patchlevel && $n eq $opt_patchlevel ) {
undef $opt_patchlevel;
}
else {
$created++;
dodiff ("", "/dev/null", $new, $n, undef);
$newcomers{$n} = (stat($o))[2]
unless $opt_fixpath || $opt_fixallpath;
}
undef $n;
}
elsif ( !defined $n || $o lt $n ) {
# Obsolete (removed) file.
push (@goners, $o);
undef $o;
}
elsif ( $o eq $n ) {
# Same file.
if ( defined $opt_patchlevel && $n eq $opt_patchlevel ) {
undef $opt_patchlevel;
}
else {
dodiff ($old, $o, $new, $n, $opt_fixallpath);
}
undef $n;
undef $o;
}
}
}
}
sub make_filelist ($;$$) {
my ($dir, $compare_dir, $disp) = @_;
# Return a list of files, sorted, for this directory.
# Recurses if $opt_recurse.
my $DIR = new IO::File;
my $fname;
$disp = "" unless defined $disp;
$compare_dir = "" unless defined $compare_dir;
trace ("+ recurse $dir\n");
opendir ($DIR, $dir) || die ("$dir: $!\n");
my @tmp = sort (readdir ($DIR));
closedir ($DIR);
debug ("Dir $dir: ", scalar(@tmp), " entries\n");
my @ret = ();
my $file;
foreach $file ( @tmp ) {
# Skip unwanted files.
next if $file =~ /^\.\.?$/; # dot and dotdot
next if $file =~ /~$/; # editor backup files
my $fname = "$dir/$file";
my $compare_name;
if ( $compare_dir ) {
$compare_name = "$compare_dir$file";
}
else {
$compare_name = "$file";
}
# Skip exclusions.
if ( defined $exclude_pat && $compare_name =~ /$exclude_pat/mso ) {
verbose ("Excluding $compare_name\n");
next;
}
# Push on the list.
if ( -d $fname && ( $opt_follow || ! -l $fname ) ) {
next unless $opt_recurse;
# Recurse.
push (@ret, make_filelist ($fname,
$compare_dir . "$file/",
$disp . "$file/"));
}
elsif ( -f _ ) {
push (@ret, $disp . $file);
}
else {
print STDERR ("Ignored $fname: not a file\n");
}
}
@ret;
}
sub domanifest ($) {
my ($man) = @_;
my $MAN = new IO::File;
my @ret = ();
open ($MAN, $man) || die ("$man: $!\n");
while ( <$MAN> ) {
if ( $. == 2 && /^[-=_\s]*$/ ) {
@ret = ();
next;
}
next if /^#/;
next unless /\S/;
$_ = $` if /\s/;
push (@ret, $_);
}
close ($MAN);
@ret = grep ($_ !~ /$exclude_pat/mso, @ret) if defined $exclude_pat;
@ret = sort @ret if $opt_sort;
@ret;
}
sub dodiff ($$$$$) {
my ($olddir, $old, $newdir, $new, $fixpath) = @_;
# Produce a patch hunk.
my $cmd = $opt_diff;
# Check for dangerous file names.
my $f;
for $f ( $olddir.$old, $newdir.$new ) {
if ( $f !~ /\'/ ) {
$cmd .= " '$f'";
}
elsif ( $f !~ /[\"\$\`]/ ) {
$cmd .= " \"$f\"";
}
else {
print STDERR ("Dangerous filename $f -- skipped\n");
return;
}
}
trace ("+ ", $cmd, "\n");
my $result = system ("$cmd > $tmpfile");
debug (sprintf ("+> result = 0x%x\n", $result)) if $result;
if ( $result && $result < 128 ) {
wrapup (($result == 2 || $result == 3)
? "User request" : "System error");
exit (1);
}
return unless $result == 0x100; # no diffs
$patched++;
print PATCH ("Index: ", $new, "\n");
# Try to find a prereq.
# The RCS code is based on a suggestion by jima@netcom.com, who also
# pointed out that patch requires blanks around the prereq string.
open (OLD, $olddir . $old);
while ( <OLD> ) {
next unless (/\@\(\#\)/ # SCCS header
|| /\$Header:/ # RCS Header
|| /\$Id:/); # RCS Header
next unless $' =~ /\s\d+(\.\d+)*\s/; # e.g. 5.4
print PATCH ("Prereq: $&\n");
last;
}
close (OLD);
# Add output from user defined file information command.
if ( defined $opt_infocmd ) {
my $cmd = $opt_infocmd;
$cmd =~ s/\002P/$olddir$old/g;
$cmd =~ s/\003P/$newdir$new/g;
print PATCH (`$cmd`);
}
# Copy patch.
open (TMP, $tmpfile);
if ( $fixpath ) {
# As told by Nigel Metheringham <Nigel.Metheringham@ThePLAnet.net>.
# Fix up pathnames of diff to feed a bug in patch
# only looks at first 3 lines of diff.
# The wierd methodology is to avoid strange RE effects.
my $linecnt = 0;
my $line;
my $fnoff;
while ( defined ($line = <TMP>) ) {
if ( $line =~ /^\*{3}\s+/ ) {
$fnoff = length ($&);
substr ($line, $fnoff, length($olddir)) = ""
if substr ($line, $fnoff, length($olddir)) eq $olddir;
}
elsif ( $line =~ /^\-{3}\s+/ ) {
$fnoff = length ($&);
substr ($line, $fnoff, length($newdir)) = ""
if substr ($line, $fnoff, length($newdir)) eq $newdir;
}
print PATCH ($line);
last if ++$linecnt > 2;
}
print PATCH <TMP>;
}
else {
# As told by Ulrich Pfeifer (pfeifer@ls6.informatik.uni-dortmund.de).
my $ndir = $newdir;
$ndir =~ s:/?\.?$::;
$ndir =~ s:.*/::;
print PATCH ("####### $newdir => $ndir\n");
while ( <TMP> ) {
s:^\*\*\* /dev/null:*** $newdir$new:;
# As told by Julian Yip <julian@computer.org>.
# Don't do the following substitution
# if $olddir or $newdir is empty.
s:^--- $newdir:--- $ndir/: if $newdir ne "";
s:^\*\*\* $olddir:*** $ndir/: if $olddir ne "";
print PATCH;
}
}
close (TMP);
}
sub perlfn ($) {
my ($file) = @_;
# Protect file name from string expansion.
'"'.quotemeta($file).'"';
}
sub generate_perl ($) {
my ($cmds) = @_;
my $ts = "".localtime(time);
# Copy perl program from DATA.
while ( <DATA> ) {
if ( /^#### Commands go here/ ) {
foreach ( @$cmds ) {
my ($op, $file, $arg) = @$_;
if ( $op eq 'r' ) {
print STDOUT ("remove_file (".perlfn($file).");\n");
}
elsif ( $op eq 'R' ) {
print STDOUT ("remove_directory (".perlfn($file).");\n");
}
elsif ( $op eq 'C' ) {
print STDOUT ("create_directory (".perlfn($file));
print STDOUT (", $arg") if defined $arg;
print STDOUT (");\n");
}
elsif ( $op eq 'c' ) {
print STDOUT ("create_file (".perlfn($file));
print STDOUT (", $arg") if defined $arg;
print STDOUT (");\n");
}
}
}
elsif ( /^#### Check goes here/ ) {
my $tag = "check (";
foreach ( @checkfiles ) {
my ($file, $size) = @$_;
print STDOUT ($tag, perlfn($file).", $size");
$tag = ",\n ";
}
print STDOUT (");\n");
}
elsif ( /^my \$olddir/ ) {
print STDOUT ("my \$olddir = ".perlfn($old).";\n");
}
elsif ( /^my \$newdir/ ) {
print STDOUT ("my \$newdir = ".perlfn($new).";\n");
}
elsif ( /^It was generated/ ) {
print STDOUT ("It was generated by " . $my_name . " " .
$my_version . " on " . $ts . "\n");
}
else {
print STDOUT $_;
}
}
# Copy patch.
open (PATCH, $thepatch);
print STDOUT while <PATCH>;
close (PATCH);
# Print a reassuring "End of Patch" note so people won't
# wonder if their mailer truncated patches.
print STDOUT ("\n\nEnd of Patch.\n");
# Cleanup.
unlink ($tmpfile, $thepatch);
}
sub generate_shell ($) {
my ($cmds) = @_;
my $tmp = '';
$tmp = "\n# /bin/sh <this-file>" if @goners || %newcomers;
my $ts = "".localtime(time);
print STDOUT <<EOD;
# This is a patch for $old to update it to $new.
# It was generated by $my_name $my_version on $ts.
#
# To apply this patch, chdir to source directory $old and enter
#$tmp
# patch -p1 -N < <this-file>
EOD
foreach ( @$cmds ) {
my ($op, $file, $arg) = @$_;
if ( $op eq 'r' ) {
print STDOUT ("rm -f $file\n");
}
elsif ( $op eq 'R' ) {
print STDOUT ("rmdir $file\n");
}
elsif ( $op eq 'C' ) {
print STDOUT ("mkdir $file\n");
}
elsif ( $op eq 'c' ) {
print STDOUT ("touch $file\n");
printf STDOUT ("chmod %o %s\n", $arg, $file) if defined $arg;
}
}
print STDOUT <<EOD;
exit
# End of preamble.
# Patch input follows.
__DATA__
EOD
# Copy patch.
open (PATCH, $thepatch);
print STDOUT while <PATCH>;
close (PATCH);
# Print a reassuring "End of Patch" note so people won't
# wonder if their mailer truncated patches.
print STDOUT ("\n\nEnd of Patch.\n");
# Cleanup.
unlink ($tmpfile, $thepatch);
}
sub wrapup (;$) {
my ($reason) = @_;
if ( defined $reason ) {
print STDERR ("*** Aborted: $reason ***\n");
}
verbose ("Collecting: $patched patch",
$patched == 1 ? "" : "es", "... ");
print STDOUT ("\n") if $opt_verbose && -t STDOUT;
my @cmds = ();
my $dgoners = 0;
{
my %dir_gone = ();
foreach ( sort @goners ) {
push (@cmds, [ 'r', $_ ]);
my @p = split (/\//, $_);
pop (@p);
foreach my $i ( (1-@p)..0 ) {
my $dir = join('/',@p[0..-$i]);
unless ( defined $dir_gone{$dir} ) {
unless ( -d "$new/$dir" ) {
$dgoners++;
$dir_gone{$dir} = 1;
}
}
}
}
foreach ( reverse sort keys %dir_gone ) {
push (@cmds, [ 'R', $_ ]);
}
}
my $dcreated = 0;
{
my %dir_ok = ();
foreach ( sort keys %newcomers ) {
# Explicitly create the new files since not all patch versions
# can handle creating new files.
# Create intermediate directories first.
my @p = split (/\//, $_);
pop (@p);
foreach my $i ( 0..(@p-1) ) {
my $dir = join('/',@p[0..$i]);
unless ( defined $dir_ok{$dir} ) {
unless ( -d "$old/$dir" ) {
push (@cmds, [ 'C', $dir ]);
$dcreated++;
}
$dir_ok{$dir} = 1;
}
}
# Create the file and change the mode if needed.
if ( defined $newcomers{$_} && $newcomers{$_} & 0111 ) {
push (@cmds, [ 'c', $_, $newcomers{$_} & 0777 ])
}
else {
push (@cmds, [ 'c', $_ ]);
}
}
}
if ( lc($opt_generate) eq 'perl' ) {
generate_perl (\@cmds);
}
else {
generate_shell (\@cmds);
}
return unless $opt_verbose;
my $goners = scalar (@goners);
print STDERR ("Collecting patches... ") if -t STDOUT;
print STDERR ("done.\n");
if ( $created ) {
print STDERR (" $created file",
$created == 1 ? "" : "s");
print STDERR (" and $dcreated director",
$dcreated == 1 ? "y" : "ies") if $dcreated;
print STDERR (" need",
($dcreated+$created != 1) ? "" : "s",
" to be created.\n");
}
if ( $goners ) {
print STDERR (" $goners file",
$goners == 1 ? "" : "s");
print STDERR (" and $dgoners director",
$dgoners == 1 ? "y" : "ies") if $dgoners;
print STDERR (" need",
($goners+$dgoners != 1) ? "" : "s",
" to be removed.\n");
}
}
sub app_options () {
my $opt_manifest;
my $opt_quiet = 0;
my $opt_help = 0;
my $opt_exclude_vc = 0;
my $opt_ident = 0;
my $opt_rcfile;
my @o = (
"debug" => \$opt_debug,
"diff=s" => \$opt_diff,
"exclude-regex=s@" => \@opt_exclude_regex,
"exclude-vc" => \$opt_exclude_vc,
"exclude=s@" => \@opt_exclude,
"filelist|list" => \$opt_filelist,
"fixallpath" => \$opt_fixallpath,
"fixpath" => \$opt_fixpath,
"follow" => \$opt_follow,
"generate=s" => \$opt_generate,
"help" => \$opt_help,
"ident" => \$opt_ident,
"infocmd=s" => \$opt_infocmd,
"manifest|man=s" => \$opt_manifest,
"newmanifest|newman=s" => \$opt_newmanifest,
"oldmanifest|oldman=s" => \$opt_oldmanifest,
"patchlevel=s" => \$opt_patchlevel,
"prefix=s" => \$opt_prefix,
"quiet" => \$opt_quiet,
"sort!" => \$opt_sort,
"recurse!" => \$opt_recurse,
"trace" => \$opt_trace,
"verbose|v" => \$opt_verbose,
);
my $init;
# Process ENV options.
if ( defined ($init = $ENV{MAKEPATCHINIT}) ) {
require Text::ParseWords;
local (@ARGV) = Text::ParseWords::shellwords ($init);
unless ( GetOptions (@o, "rcfile=s" => \$opt_rcfile) &&
@ARGV == 0 ) {
print STDERR ("Error in MAKEPATCHINIT\n");
app_usage ();
}
}
# Process ini file options.
$init = 1;
unless ( defined $opt_rcfile ) {
$opt_rcfile = $ENV{HOME}."/.".$my_name."rc";
$init = 0;
}
my $rcfile = new IO::File;
if ( open ($rcfile, $opt_rcfile) ) {
require Text::ParseWords;
my @lines = <$rcfile>;
close ($rcfile);
local (@ARGV) = Text::ParseWords::shellwords (@lines);
unless ( GetOptions (@o) && @ARGV == 0 ) {
print STDERR ("Error in $opt_rcfile\n");
app_usage ();
}
}
# File must be present if explicitly named.
elsif ( $init ) {
die ("$opt_rcfile: $!\n");
}
# Process command line options
if ( !GetOptions (@o) || $opt_help ) {
app_usage();
}
# Argument check.
if ( $opt_filelist ) {
if ( defined $opt_manifest ) {
app_usage () if @ARGV;
@ARGV = ( $opt_manifest );
}
else {
app_usage () unless @ARGV == 1;
}
}
else {
app_usage () unless @ARGV == 2;
}
$opt_trace = 1 if $opt_debug;
$opt_verbose = 0 if $opt_quiet;
print STDERR ("This is $my_name version $my_version\n")
if $opt_verbose || $opt_ident;
if ( $opt_prefix ne '' ) {
die ("$0: option \"-prefix\" requires \"-filelist\"\n")
unless $opt_filelist;
}
if ( defined $opt_sort ) {
die ("$0: option \"-[no]sort\" requires \"-filelist\"\n")
unless $opt_filelist;
}
else {
$opt_sort = 1;
}
if ( $opt_filelist ) {
die ("$0: option \"-filelist\" only uses \"-manifest\"\n")
if defined $opt_oldmanifest || defined $opt_newmanifest;
}
if ( defined $opt_manifest ) {
die ("$0: do not use \"-manifest\" with \"-oldmanifest\"".
" or \"-newmanifest\"\n")
if defined $opt_newmanifest || defined $opt_oldmanifest;
$opt_newmanifest = $opt_oldmanifest = $opt_manifest;
}
if ( defined $opt_infocmd ) {
die ("$0: \"-infocmd\" can not be used with \"-filelist\"\n")
if $opt_filelist;
# Protect %% sequences.
$opt_infocmd =~ s/\%\%/\001/g;
# Encode %o and %n sequences.
$opt_infocmd =~ s/\%o([P])/\002$1/g;
$opt_infocmd =~ s/\%n([P])/\003$1/g;
# Restore %% sequences.
$opt_infocmd =~ s/\001/%%/g;
while ( $opt_infocmd =~ /(\%[on]\S)/g ) {
print STDERR ("Warning: $1 in info command may become ",
"special in the future\n");
}
}
if ( $opt_generate !~ /^(perl|sh|shell)$/i ) {
die ("$0: option \"-generate\" requires a value of \"perl\" or \"shell\"\n");
}
# Exclude options.
unshift (@opt_exclude_regex,
'(\A|.*/)CVS(/.*|\Z)',
'(\A|.*/)RCS(/.*|\Z)', ',v\Z',
'(\A|.*/)SCCS(/.*|\Z)', '(\A|.*/)[sp]\..+\Z',
) if $opt_exclude_vc;
}
sub app_usage () {
print STDERR <<EoU;
This is $my_name version $my_version
Usage: $0 [options] old new
Usage: $0 -filelist [ -prefix XXX ] [ -nosort ] [ -manifest ] file
Makepatch options:
-diff cmd diff command to use, default \"$opt_diff\"
-patchlevel file file to use as patchlevel.h
-man[ifest] file list of files for old and new dir
-newman[ifest] file list of files for new dir
-oldman[ifest] file list of files for old dir
-follow follow symbolic links
-fixpath fixup diff pathnames for new files
-fixallpath fixup diff pathnames for all files
-infocmd cmd add output of cmd to each patch chunk
-exclude pat exclude files according to wildcard pattern
-exclude-regex pat exclude files and dirs matching regex pattern
-exclude-vc exclude version control files (RCS, CVS, SCCS)
-[no]recurse recurse through directories (default)
-generate XXX style of output, either "perl" or "shell" (default)
Filelist options:
-[file]list extract filenames from manifest file
-prefix XXX add a prefix to these filenames
-nosort do not sort manifest entries
General options:
-verbose verbose output (default)
-quiet no verbose output
-help this message
EoU
exit (1);
}
__DATA__
#!/usr/bin/perl -w
################ Common stuff ################
use strict;
################ Command line parameters ################
use Getopt::Long 2.13;
sub app_options();
my $olddir;
my $newdir;
my $check = 0; # check only
my $patch = 'patch -p1 -N'; # patch command
my $verbose = 0; # verbose processing
# Development options (not shown with -help).
my $debug = 0; # debugging
my $trace = 0; # trace (show process)
my $test = 0; # test (no actual processing)
app_options();
# Options post-processing.
$trace |= ($debug || $test);
################ Presets ################
my $TMPDIR = $ENV{TMPDIR} || '/usr/tmp';
################ The Process ################
sub check (@);
sub create_file ($;$);
sub create_directory ($;$);
sub remove_file ($);
sub remove_directory ($);
# Check that we're in the right place.
#### Check goes here.
exit 0 if $check;
# Preamble.
#### Commands go here.
# End of preamble.
# Execute the patch program.
print STDERR ("+ $patch\n") if $trace;
open (PATCH, "|$patch")
|| die ("Cannot open pipe to \"$patch\"\n");
print PATCH while <DATA>;
close (PATCH)
|| die ("Possible problems with \"$patch\", status = $?\n");
################ Subroutines ################
sub check (@) {
my @args = @_;
my $err = 0;
while ( @args ) {
my $file = shift (@args);
my $size = shift (@args);
print STDERR ("+ check: $file $size\n");
unless ( -e $file ) {
warn ("Integrity check: file $file does not exist\n");
$err++;
}
unless ( -f _ ) {
warn ("Integrity check: $file should be a plain file\n");
$err++;
}
my $s = -s _;
unless ( $s == $size ) {
warn ("Integrity check: size of file $file should be $size, ".
"but it is $s\n");
$err++;
}
}
if ( $err ) {
die ("*** Integrity check failed ***\n",
"Apparently this is not the expected source directory $olddir.\n",
"Use \"perl $0 -dir <dir>\" to change to the right directory.\n");
}
}
sub create_file ($;$) {
my ($file, $mode) = @_;
$mode = 0666 unless defined $mode;
print STDERR ("+ create $file\n") if $trace;
open (F, '>'.$file)
|| die ("Cannot create $file: $!\n");
close (F);
printf STDERR ("+ chmod 0%o $file\n", $mode) if $trace;
chmod ($mode, $file)
|| warn sprintf ("WARNING: Cannot chmod 0%o $file: $!\n", $mode);
}
sub create_directory ($;$) {
my ($dir, $mode) = @_;
$mode = 0777 unless defined $mode;
printf STDERR ("+ mkdir 0%o $dir\n", $mode) if $trace;
mkdir ($dir, $mode)
|| die ("Cannot create directory $dir: $!\n");
}
sub remove_file ($) {
my ($file) = @_;
print STDERR ("+ unlink $file\n") if $trace;
unlink ($file)
|| warn ("WARNING: Cannot remove $file: $!\n");
}
sub remove_directory ($) {
my ($dir) = @_;
print STDERR ("+ rmdir $dir\n") if $trace;
rmdir ($dir)
|| warn ("WARNING: Cannot remove directory $dir: $!\n");
}
################ Options and Help ################
sub app_ident;
sub app_usage($);
sub app_options() {
my $help = 0; # handled locally
my $ident = 0; # handled locally
my $dir; # handled locally
# Process options, if any.
# Make sure defaults are set before returning!
return unless @ARGV > 0;
if ( !GetOptions(
'check' => \$check,
'dir=s' => \$dir,
'ident' => \$ident,
'verbose' => \$verbose,
'quiet' => sub { $verbose = 0; },
'patch=s' => \$patch,
'trace' => \$trace,
'help|?' => \$help,
'debug' => \$debug,
) or $help )
{
app_usage(2);
}
app_ident if $ident || $verbose;
if ( defined $dir ) {
chdir ($dir)
|| die ("Cannot change to $dir: $!\n");
}
}
sub app_ident {
print STDERR <<EOD;
This is a patch for $olddir to update it to $newdir.
It was generated by makepatch.
EOD
}
sub app_usage($) {
my ($exit) = @_;
app_ident;
print STDERR <<EndOfUsage;
To apply this patch, chdir to directory $olddir and run this script.
Usage: perl $0 [options] [file ...]
-help this message
-dir change to this directory before executing
-check check, but does not execute
-patch XXX the patch command, default "$patch"
-ident show identification
-quiet no information
-verbose verbose information
EndOfUsage
exit $exit if $exit != 0;
}
__END__
=head1 NAME
makepatch - create patch diffs between two versions of source
=head1 SYNOPSIS
B<makepatch> [ I<options> ] I<old> I<new>
B<makepatch> B<-filelist> [ I<options> ] I<manifest>
=head1 DESCRIPTION
B<Makepatch> generates a set of differences between two files or two
sets of files maintained in two different directories and prints the
results to I<stdout>. This resulting output is suitable for use by
the B<patch>(1) program to update copies of the target file from
the I<old> to the I<new> version.
Features of this utility include:
=over 4
=item *
Recursive descend through sub-directories.
=item *
Generation of commands to remove obsolete files.
=item *
Automatic handling of the I<patchlevel.h> file first.
=item *
Automatic inclusion of I<Index:> and I<Prereq:> lines.
=item *
Ability to utilize specified I<manifest> files.
=back
=head1 ARGUMENTS
=over 4
=item I<old>
This is the name of either a single file or else a directory which
contains copies of the older version of the target files; in
other words, copies of the files I<prior> to any modifications.
=item I<new>
This is the name of either a single file or else a directory which
contains copies of the newer version of the target files; in other
words, copies of the files I<after> the modifications have been
made. A B<rm>(1) command will automatically be generated for every
I<old> file that no longer has a corresponding I<new> version.
=back
B<makepatch> takes several options to control its behaviour. Options
are usually specified on the command line, but B<makepatch> can take
options from three sources in the following order:
=over 4
=item *
Environment variable B<MAKEPATCHINIT>.
When this environment variable is set its contents are considered to
be command line options that are processed upon startup. All normal
options are allowed, plus one: B<-rcfile >I<filename>. Option
B<-rcfile> can be used to specify an alternate option file, see below.
=item *
An option file.
By default, B<makepatch> looks for a file named B<.makepatchrc> in the
user's home directory, and, if found, consideres all lines to contain
one or more command line options.
An alternative option file can be specified with option B<-rcfile> in
environment variable B<MAKEPATCHINIT>.
=item *
The command line.
=back
=head1 MAKEPATCH OPTIONS
=over 4
=item B<-generate> I<type>
This can be used to select the type of script to generate. Default is
a script to be executed under the standard Unix shell I<sh>, but it is
much better to generate a perl program instead.
I<type> can be B<perl> to designate that a perl program is required,
or B<sh> or B<shell> to designate a shell script.
=item B<-diff> I<cmd>
If specified, I<cmd> is the command to be used to
generate the differences between the two versions of the files. If
not specified, this command defaults to "B<diff -c>".
=item B<-patchlevel> I<pfile>
If specified, I<pfile> indicates an alternate file that is to be
used in lieu of "B<patchlevel.h>".
=item B<-man>[B<ifest>] I<mfile>
If specified, I<mfile> indicates the name of the manifest file
which consists of a list of the files contained in both the I<old>
and the I<new> directories.
=item B<-oldman>[B<ifest>] I<omfile>
If specified, I<omfile> indicates the name of the manifest file which
consists of a list of the files contained in the I<old> directory.
This option is designed to be used in conjunction with the
B<-newmanifest> option. Note that the I<old> and I<new> directories
must still be indicated.
=item B<-newman>[B<ifest>] I<nmfile>
If specified, I<nmfile> indicates the name of the manifest file which
consists of a list of the files contained in the I<new> directory.
This option is designed to be used in conjunction with the
B<-oldmanifest> option. Note that the I<old> and I<new>
directories must still be indicated.
=item B<->[B<no>]B<recurse>
B<makepatch> recurses through directories by default. Option
B<-norecurse> prevents recursion beyond the initial directories.
=item B<-follow>
If specified, symbolic links to directories are traversed as if they
were real directories.
=item B<-infocmd> I<command>
If specified, the output of running I<command> will be added before
each patch chunk. I<command> will undergo the following substitutions
first: C<%oP> will be replaced by the name of the old file, C<%nP>
will be replaced by the name of the new file. C<%%> will be replaced
by a single C<%>; other C<%> sequences may be added in future
versions.
Note that C<%oP> and C<%nP> are modelled after the C<%> sequences of
B<find -printf>.
=item B<-exclude> I<pattern>
If specified, files that match the shell pattern I<pattern> will be
excluded. Only wildcard characters C<*> and C<?>, and character
classes C<[...]> are handled. Multiple B<-exclude> options may be
supplied.
=item B<-exclude-regex> I<pattern>
If specified, files and directories that match the Perl regular
expression pattern I<pattern> will be excluded.
Multiple B<-exclude-regex> options may be supplied.
=item B<-exclude-vc>
If specified, files and directories that are usually part of version
control systems are excluded. Supported version control systems are
CVS, RCS and SCCS.
B<-exclude-vc> is a quick way to enable exclusion by the following
regular expressions:
(\A|.*/)CVS(/.*|\Z)
(\A|.*/)RCS(/.*|\Z)
,v\Z
(\A|.*/)SCCS(/.*|\Z)
(\A|.*/)[sp]\..+\Z'
=item B<-fixpath>
Correct diff pathnames for new files.
Use this for buggy B<diff> or B<patch> programs.
=item B<-fixallpath>
Correct diff path names for all files.
Use this for buggy B<diff> or B<patch> programs.
=back
=head1 FILELIST OPTIONS
=over
=item B<->[B<file>]B<list>
This option instructs B<makepatch> to read a manifest file, and output
the list of files included in this manifest. This option is useful to
turn the contents of a manifest file into a list of files suitable for
other programs.
=item B<-man>[B<ifest>] I<mfile>
If specified, I<mfile> indicates the name of the manifest file to
be used. Alternatively, the name of the manifest file may follow the
command line options.
=item B<-prefix > I<string>
Every entry in the manifest file is prefixed with I<string> before it
is written to I<stdout>.
=item B<-nosort>
Retain the order of filenames from the manifest file.
=back
The exclude options B<-exclude>, B<-exclude-regex> and B<-exclude-vc>
can also be used with b<filelist>.
=head1 GENERAL OPTIONS
=over
=item B<-ident>
The program name and version is reported.
=item B<-verbose>
This is the default mode which displays information concerning
B<makepatch>s activity to I<stderr>.
=item B<-quiet>
The opposite of B<-verbose>. This instructs I<makepatch> to suppress
the display of activity information.
=item B<-help>
This causes a short help message to be displayed, after which the
program immediately exits.
=back
=head1 MANIFEST FILES
Although there is no formal standard for manifest files, the following
rules apply:
=over 4
=item *
If the second line from the manifest file looks like a separator line
(e.g. it is empty, or contains only dashes), it is discarded and so is
the first line.
=item *
Empty lines and lines that start with a C<#> are ignored.
=item *
If there are multiple space-separated ``words'' on a line, the first
word is considered to be the filename.
=back
=head1 ENVIRONMENT VARIABLES
=over
=item MAKEPATCHINIT
When this environment variable is set its contents is considered to be
command line options that are processed upon startup. All normal
options are allowed, plus one: B<-rcfile >I<filename>. If B<-rcfile>
is specified, the file is read and all lines of it are considered to
contain one or more command line options.
=item TMPDIR
C<TMPDIR> can be used to designate the area where temporary files are
placed. It defaults to C</usr/tmp>.
=back
=head1 EXAMPLES
Suppose you have a directory tree F<emacs-18.58> containing the
sources for GNU Emacs 18.58, and a directory tree F<emacs-18.59>
containing the sources for GNU Emacs 18.59. The following command will
generate the patch file needed to transform the 18.58 sources into
18.59:
makepatch emacs-18.58 emacs-18.59 > emacs-18.58-18.59.diff
This is one way to generate and use manifest files:
(cd emacs-18.58; find . -type f -print > MANIFEST)
(cd emacs-18.59; find . -type f -print > MANIFEST)
makepatch \
-oldmanifest emacs-18.58/MANIFEST \
-newmanifest emacs-18.59/MANIFEST \
emacs-18.58 emacs-18.59 > emacs-18.58-18.59.diff
The following example transforms the manifest file into a list of
files suitable for GNU tar. Note the trailing F</> in the prefix
string:
makepatch -filelist -prefix emacs-18.59/ emacs-18.59/MANIFEST | \
gtar -Zcvf emacs-18.59.tar.Z -T -Op
=head1 BUGS AND RESTRICTIONS
Filenames thet contain single quotes may confuse the process.
B<makepatch> does not know about symbolic links.
These will be treated like plain files.
=head1 SEE ALSO
B<diff>(1),
B<patch>(1),
B<perl>(1),
B<rm>(1).
=head1 AUTHOR AND CREDITS
Johan Vromans (jvromans@squirrel.nl) wrote the program, with a little
help and inspiration from: Jeffery Small (jeff@cjsa.uucp), Ulrich
Pfeifer (pfeifer@ls6.informatik.uni-dortmund.de), Nigel Metheringham
<Nigel.Metheringham@ThePLAnet.net>, Julian Yip <julian@computer.org>,
Tim Bunce <Tim.Bunce@ig.co.uk>, Rob Browning <rlb@cs.utexas.edu>, and
others.
=head1 COPYRIGHT AND DISCLAIMER
This program is Copyright 1992,1998 by Johan Vromans.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
If you do not have a copy of the GNU General Public License write to
the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA.
=cut
!NO!SUBS!
close OUT or die "Can't close $file: $!";
chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
|