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
|
case $CONFIG in
'')
if test -f config.sh; then TOP=.;
elif test -f ../config.sh; then TOP=..;
elif test -f ../../config.sh; then TOP=../..;
elif test -f ../../../config.sh; then TOP=../../..;
elif test -f ../../../../config.sh; then TOP=../../../..;
else
echo "Can't find config.sh."; exit 1
fi
. $TOP/config.sh
;;
esac
case "$0" in
*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
esac
echo "Extracting pat/patdiff (with variable substitutions)"
cat >patdiff <<!GROK!THIS!
$startperl
eval 'exec perl -S \$0 \${1+"\$@"}'
if \$running_under_some_shell;
# $Id$
#
# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
#
# You may redistribute only under the terms of the Artistic Licence,
# as specified in the README file that comes with the distribution.
# You may reuse parts of this distribution only within the terms of
# that same Artistic Licence; a copy of which may be found at the root
# of the source tree for dist 4.0.
#
# Original Author: Larry Wall <lwall@netlabs.com>
#
# $Log: patdiff.SH,v $
# Revision 3.0.1.2 1994/01/24 14:30:36 ram
# patch16: now prefix error messages with program's name
# patch16: added ~/.dist_profile awareness
#
# Revision 3.0.1.1 1993/08/19 06:42:35 ram
# patch1: leading config.sh searching was not aborting properly
#
# Revision 3.0 1993/08/18 12:10:43 ram
# Baseline for dist 3.0 netwide release.
#
\$version = '$VERSION';
\$patchlevel = '$PATCHLEVEL';
!GROK!THIS!
cat >>patdiff <<'!NO!SUBS!'
$RCSEXT = ',v' unless $RCSEXT;
$TOPDIR = ''; # We are at top-level directory
$progname = &profile; # Read ~/.dist_profile
require 'getopts.pl';
&usage unless $#ARGV >= 0;
&usage unless &Getopts("ahnV");
if ($opt_V) {
print STDERR "$progname $version PL$patchlevel\n";
exit 0;
} elsif ($opt_h) {
&usage;
}
&readpackage;
©right'init($copyright) if -f $copyright;
system 'mkdir', 'bugs' unless -d 'bugs';
if (-f 'patchlevel.h') {
open(PL,"patchlevel.h") || die "$progname: can't open patchlevel.h: $!\n";
while (<PL>) {
$bnum = $1 if /^#define\s+PATCHLEVEL\s+(\d+)/;
}
die "$progname: malformed patchlevel.h file.\n" if $bnum eq '';
++$bnum;
} else {
$bnum=1;
}
if ($opt_a) {
open(MANI,"MANIFEST.new") || die "$progname: can't read MANIFEST.new: $!\n";
@ARGV = ();
while (<MANI>) {
chop;
($_) = split(' ');
next if -d;
push(@ARGV,$_);
}
close MANI;
}
foreach $file (@ARGV) {
next if ($file =~ /^patchlevel.h$/); # Skip patchlevel.h
if (! -f $file) {
print "$progname: $file not found.\n";
next;
}
$files = &rcsargs($file);
@files = split(' ',$files);
$new='';
$revs=0;
$rlog = `rlog -rlastpat- $files 2>&1`;
($lastpat) = ($rlog =~ /lastpat: ([\d.]+)/);
($revs) = ($rlog =~ /selected revisions: (\d+)/);
if (!$revs) {
print "$progname: no cil has been done on $file.\n" ;;
} elsif ($revs == 1) {
($base) = ($rlog =~ /.*\nrevision\s+(\S+)/);
($a,$b,$c,$d) = split(/\./,$base);
if ($d ne '') {
if (!$opt_n) {
print
"$progname: no changes in $file since last patch. (Did you cil it?)\n";
next; # Skip file with no changes
} else {
$new='foo';
}
} else {
$revs=0;
$rlog = `rlog -r$revbranch- $files 2>&1`;
($revs) = ($rlog =~ /selected revisions: (\d+)/);
if (!$revs) {
print
"$progname: no changes in $file since base version. (Did you cil it?)\n";
next; # Skip file with no changes
} else {
($new) = ($rlog =~ /\nrevision\s*(\d+\.\d+\.\d+\.\d+)/);
}
}
} else {
($new) = ($rlog =~ /\nrevision\s*(\d+\.\d+\.\d+\.\d+)/);
}
if ($new ne '') {
($fname = $file) =~ s|.*/||;
$fname = substr($fname, 0, 11); # For filsystems with short names
open(PATCH,">>bugs/$fname.$bnum") || die "Can't make patch";
print PATCH "\nIndex: $file\n";
open(CO,"co -p -rlastpat $files 2>/dev/null |");
while (<CO>) {
if (/\$Header/ || /\$Id/) {
print PATCH "Prereq: $lastpat\n";
last;
}
}
close CO;
if (!$opt_n) {
if ($mydiff eq '') {
open(DIFF,"rcsdiff -c -rlastpat -r$new $files |") ||
die "$progname: can't fork rcsdiff: $!\n";
while (<DIFF>) {
if ($. == 1) {s|\*\*\* \S+ |*** $file.old |;}
if ($. == 2) {s|--- \S+ |--- $file |;}
s|Lock[e]r:.*\$|\$|; # Use [e] to make it safe on itself
print PATCH;
}
close DIFF;
system 'rcs', "-Nlastpat:$new", @files;
} else {
©right'expand("co -p -rlastpat $file", "/tmp/pdo$$");
©right'expand("co -p -r$new $file", "/tmp/pdn$$");
open(DIFF, "$mydiff /tmp/pdo$$ /tmp/pdn$$ |") ||
die "Can't run $mydiff";
while (<DIFF>) { # Contextual or unified diff
if ($. == 1) {
s|\*\*\* \S+ |*** $file.old | ||
s|--- \S+ |--- $file.old |;
}
if ($. == 2) {
s|--- \S+ |--- $file | ||
s|\+\+\+ \S+ |+++ $file |;
}
s|Lock[e]r:.*\$|\$|; # Remove locker mark
print PATCH;
}
close DIFF;
system 'rcs', "-Nlastpat:$new", @files;
unlink "/tmp/pdn$$", "/tmp/pdo$$";
}
} else {
if ($mydiff eq '') {
open(DIFF,"rcsdiff -c -rlastpat $files |") ||
die "Can't run rcsdiff";
while (<DIFF>) {
if ($. == 1) {s|\*\*\* \S+ |*** $file.old |;}
if ($. == 2) {s|--- \S+ |--- $file |;}
s|Lock[e]r:.*\$|\$|; # Remove locker mark
print PATCH;
}
close DIFF;
} else {
system "co -p -rlastpat $files >/tmp/pdo$$";
system "cp $file /tmp/pdn$$";
open(DIFF, "$mydiff /tmp/pdo$$ /tmp/pdn$$ |") ||
die "$progname: can't fork $mydiff: $!\n";
while (<DIFF>) {
# Contextual or unified diff
if ($. == 1) {
s|\*\*\* \S+ |*** $file.old |;
s|--- \S+ |--- $file.old |;
}
if ($. == 2) {
s|--- \S+ |--- $file |;
s|\+\+\+ \S+ |+++ $file |;
}
s|Lock[e]r:.*\$|\$|; # Remove locker mark
print PATCH;
}
close DIFF;
unlink "/tmp/pdn$$", "/tmp/pdo$$";
}
}
}
}
sub usage {
print STDERR <<EOM;
Usage: $progname [-ahnV] [filelist]
-a : all the files in MANIFEST.new
-h : print this message and exit
-n : non update mode
-V : print version number and exit
EOM
exit 1;
}
!NO!SUBS!
$grep -v '^;#' ../pl/package.pl >>patdiff
$grep -v '^;#' ../pl/rcsargs.pl >>patdiff
$grep -v '^;#' ../pl/copyright.pl >>patdiff
$grep -v '^;#' ../pl/tilde.pl >>patdiff
$grep -v '^;#' ../pl/profile.pl >>patdiff
chmod +x patdiff
$eunicefix patdiff
|
