use Getopt::Long qw(:config bundling no_auto_abbrev);
use Pod::Usage;
use Config;
-use Carp;
my @targets
= qw(config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep);
-my $cpus;
-if (open my $fh, '<', '/proc/cpuinfo') {
- while (<$fh>) {
- ++$cpus if /^processor\s+:\s+\d+$/;
- }
-} elsif (-x '/sbin/sysctl') {
- $cpus = 1 + $1 if `/sbin/sysctl hw.ncpu` =~ /^hw\.ncpu: (\d+)$/;
-} elsif (-x '/usr/bin/getconf') {
- $cpus = 1 + $1 if `/usr/bin/getconf _NPROCESSORS_ONLN` =~ /^(\d+)$/;
-}
-
my %options =
(
- jobs => defined $cpus ? $cpus + 1 : 2,
'expect-pass' => 1,
clean => 1, # mostly for debugging this
);
(
usedevel => '',
optimize => '-g',
- cc => (`ccache --version`, $?) ? 'cc' : 'ccache cc',
ld => 'cc',
($linux64 ? (libpth => \@paths) : ()),
);
unless(GetOptions(\%options,
'target=s', 'make=s', 'jobs|j=i', 'expect-pass=i',
'expect-fail' => sub { $options{'expect-pass'} = 0; },
- 'clean!', 'one-liner|e=s', 'l', 'w', 'match=s',
+ 'clean!', 'one-liner|e=s', 'c', 'l', 'w', 'match=s',
'no-match=s' => sub {
$options{match} = $_[1];
$options{'expect-pass'} = 0;
},
'force-manifest', 'force-regen', 'test-build', 'validate',
+ 'all-fixups', 'early-fixup=s@', 'late-fixup=s@',
'check-args', 'check-shebang!', 'usage|help|?', 'A=s@',
'D=s@' => sub {
my (undef, $val) = @_;
pod2usage(exitval => 255, verbose => 1);
}
-my ($target, $j, $match) = @options{qw(target jobs match)};
+my ($target, $match) = @options{qw(target match)};
@ARGV = ('sh', '-c', 'cd t && ./perl TEST base/*.t')
if $options{validate} && !@ARGV;
-pod2usage(exitval => 0, verbose => 1) if $options{usage};
+pod2usage(exitval => 0, verbose => 2) if $options{usage};
pod2usage(exitval => 255, verbose => 1)
unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
pod2usage(exitval => 255, verbose => 1)
.../Porting/bisect.pl -e 'my $a := 2;'
# When did this stop being an error?
.../Porting/bisect.pl --expect-fail -e '1 // 2'
- # When did this stop matching?
+ # When were all lines matching this pattern removed from all files?
.../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
- # When did this start matching?
+ # When was some line matching this pattern added to some file?
.../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
- # When did this test program stop working?
+ # When did this test program stop exiting 0?
.../Porting/bisect.pl -- ./perl -Ilib ../test_prog.pl
+ # When did this test start failing?
+ .../Porting/bisect.pl -- ./perl -Ilib t/TEST op/sort.t
# When did this first become valid syntax?
.../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
--expect-fail -e 'my $a := 2;'
=item *
-Which commit added the first to match this regex?
+Which commit added the first file to match this regex?
=item *
-Which commit removed the last to match this regex?
+Which commit removed the last file to match this regex?
=back
By default F<bisect.pl> will process all options, then use the rest of the
command line as arguments to list C<system> to run a test case. By default,
the test case should pass (exit with 0) on earlier perls, and fail (exit
-non-zero) on I<blead>. F<bisect.pl> will use F<bisect-runner.pl> to find the
-earliest stable perl version on which the test case passes, check that it
-fails on blead, and then use F<bisect-runner.pl> with C<git bisect run> to
-find the commit which caused the failure.
+non-zero) on I<blead> (note that running most of perl's test files directly
+won't do this, you'll need to run them through a harness to get the proper
+error code). F<bisect.pl> will use F<bisect-runner.pl> to find the earliest
+stable perl version on which the test case passes, check that it fails on
+blead, and then use F<bisect-runner.pl> with C<git bisect run> to find the
+commit which caused the failure.
Because the test case is the complete argument to C<system>, it is easy to
run something other than the F<perl> built, if necessary. If you need to run
=item *
+-c
+
+Add C<-c> to the command line, to cause perl to exit after syntax checking.
+
+=item *
+
-l
Add C<-l> to the command line with C<-e>
Add C<-w> to the command line with C<-e>
-It's not valid to pass C<-l> or C<-w> to C<bisect.pl> unless you are also
-using C<-e>
+It's not valid to pass C<-c>, C<-l> or C<-w> to C<bisect.pl> unless you are
+also using C<-e>
=item *
=item *
--Dnoextensions=Encode
+-D I<config_arg=value>
=item *
--Uusedevel
+-U I<config_arg>
=item *
--Accflags=-DNO_MATHOMS
+-A I<config_arg=value>
+
+Arguments (C<-A>, C<-D>, C<-U>) to pass to F<Configure>. For example,
-Arguments to pass to F<Configure>. Repeated C<-A> arguments are passed
+ -Dnoextensions=Encode
+ -Uusedevel
+ -Accflags=-DNO_MATHOMS
+
+Repeated C<-A> arguments are passed
through as is. C<-D> and C<-U> are processed in order, and override
previous settings for the same parameter. F<bisect-runner.pl> emulates
C<-Dnoextensions> when F<Configure> itself does not provide it, as it's
-j I<jobs>
-Number of C<make> jobs to run in parallel. If F</proc/cpuinfo> exists and
-can be parsed, or F</sbin/sysctl> exists and reports C<hw.ncpu>, or
-F</usr/bin/getconf> exists and reports C<_NPROCESSORS_ONLN> defaults to 1 +
-I<number of CPUs>. Otherwise defaults to 2.
+Number of C<make> jobs to run in parallel. A value of 0 suppresses
+parallelism. If F</proc/cpuinfo> exists and can be parsed, or F</sbin/sysctl>
+exists and reports C<hw.ncpu>, or F</usr/bin/getconf> exists and reports
+C<_NPROCESSORS_ONLN> defaults to 1 + I<number of CPUs>. On HP-UX with the
+system make defaults to 0, otherwise defaults to 2.
=item *
=item *
+--all-fixups
+
+F<bisect-runner.pl> will minimally patch various files on a platform and
+version dependent basis to get the build to complete. Normally it defers
+doing this as long as possible - C<.SH> files aren't patched until after
+F<Configure> is run, and C<C> and C<XS> code isn't patched until after
+F<miniperl> is built. If C<--all-fixups> is specified, all the fixups are
+done before running C<Configure>. In rare cases adding this may cause a
+bisect to abort, because an inapplicable patch or other fixup is attempted
+for a revision which would usually have already I<skip>ed. If this happens,
+please report it as a bug, giving the OS and problem revision.
+
+=item *
+
+--early-fixup file
+
+=item *
+
+--late-fixup file
+
+Specify a file containing a patch or other fixup for the source code. The
+action to take depends on the first line of the fixup file
+
+=over 4
+
+=item *
+
+C<#!perl>
+
+If the first line starts C<#!perl> then the file is run using C<$^X>
+
+=item *
+
+C<#!/absolute/path>
+
+If a shebang line is present the file is executed using C<system>
+
+=item *
+
+C<I<filename> =~ /I<pattern>/>
+
+=item *
+
+C<I<filename> !~ /I<pattern>/>
+
+If I<filename> does not exist then the fixup file's contents are ignored.
+Otherwise, for C<=~>, if it contains a line matching I<pattern>, then the
+file is fed to C<patch -p1> on standard input. For C<=~>, the patch is
+applied if no lines match the pattern.
+
+As the empty pattern in Perl is a special case (it matches the most recent
+sucessful match) which is not useful here, an the treatment of empty pattern
+is special-cased. C<I<filename> =~ //> applies the patch if filename is
+present. C<I<filename> !~ //> applies the patch if filename missing. This
+makes it easy to unconditionally apply patches to files, and to use a patch
+as a way of creating a new file.
+
+=item *
+
+Otherwise, the file is assumed to be a patch, and always applied.
+
+=back
+
+I<early-fixup>s are applied before F<./Configure> is run. I<late-fixup>s are
+applied just after F<./Configure> is run.
+
+These options can be specified more than once. I<file> is actually expanded
+as a glob pattern. Globs that do not match are errors, as are missing files.
+
+=item *
+
--no-clean
Tell F<bisect-runner.pl> not to clean up after the build. This allows one
=cut
-die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
+# Ensure we always exit with 255, to cause git bisect to abort.
+sub croak_255 {
+ my $message = join '', @_;
+ if ($message =~ /\n\z/) {
+ print STDERR $message;
+ } else {
+ my (undef, $file, $line) = caller 1;
+ print STDERR "@_ at $file line $line\n";
+ }
+ exit 255;
+}
-$j = "-j$j" if $j =~ /\A\d+\z/;
+sub die_255 {
+ croak_255(@_);
+}
+
+die_255("$0: Can't build $target")
+ if defined $target && !grep {@targets} $target;
+
+foreach my $phase (qw(early late)) {
+ next unless $options{"$phase-fixup"};
+ my $bail_out;
+ require File::Glob;
+ my @expanded;
+ foreach my $glob (@{$options{"$phase-fixup"}}) {
+ my @got = File::Glob::bsd_glob($glob);
+ push @expanded, @got ? @got : $glob;
+ }
+ @expanded = sort @expanded;
+ $options{"$phase-fixup"} = \@expanded;
+ foreach (@expanded) {
+ unless (-f $_) {
+ print STDERR "$phase-fixup '$_' is not a readable file\n";
+ ++$bail_out;
+ }
+ }
+ exit 255 if $bail_out;
+}
+
+unless (exists $defines{cc}) {
+ # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
+ # confusing.
+ # FIXME - really it should be replaced with a proper test of
+ # "can we build something?" and a helpful diagnostic if we can't.
+ # For now, simply move it here.
+ $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
+}
+
+my $j = $options{jobs} ? "-j$options{jobs}" : '';
if (exists $options{make}) {
if (!exists $defines{make}) {
sub open_or_die {
my $file = shift;
my $mode = @_ ? shift : '<';
- open my $fh, $mode, $file or croak("Can't open $file: $!");
+ open my $fh, $mode, $file or croak_255("Can't open $file: $!");
${*$fh{SCALAR}} = $file;
return $fh;
}
sub close_or_die {
my $fh = shift;
return if close $fh;
- croak("Can't close: $!") unless ref $fh eq 'GLOB';
- croak("Can't close ${*$fh{SCALAR}}: $!");
+ croak_255("Can't close: $!") unless ref $fh eq 'GLOB';
+ croak_255("Can't close ${*$fh{SCALAR}}: $!");
+}
+
+sub system_or_die {
+ my $command = '</dev/null ' . shift;
+ system($command) and croak_255("'$command' failed, \$!=$!, \$?=$?");
}
sub extract_from_file {
local $/;
my $fh = open_or_die($file);
my $orig = <$fh>;
- die "Can't read $file: $!" unless defined $orig && close $fh;
+ die_255("Can't read $file: $!") unless defined $orig && close $fh;
my $new = $munger->($orig);
return if $new eq $orig;
$fh = open_or_die($file, '>');
- print $fh $new or die "Can't print to $file: $!";
+ print $fh $new or die_255("Can't print to $file: $!");
close_or_die($fh);
}
}
if (!length $diff_in) {
- die "That didn't seem to be a diff";
+ die_255("That didn't seem to be a diff");
}
if ($diff_in =~ /\A\*\*\* /ms) {
}
$diff_in =~ s/\A([^\n]+\n?)//ms;
my $line = $1;
- die "Can't parse '$line'" unless $line =~ s/\A--- /*** /ms;
+ die_255("Can't parse '$line'") unless $line =~ s/\A--- /*** /ms;
$diff_out .= $line;
$diff_in =~ s/\A([^\n]+\n?)//ms;
$line = $1;
- die "Can't parse '$line'" unless $line =~ s/\A\+\+\+ /--- /ms;
+ die_255("Can't parse '$line'") unless $line =~ s/\A\+\+\+ /--- /ms;
$diff_out .= $line;
# Loop for hunks
my $to_end = $to_start + $to_count - 1;
my ($from_out, $to_out, $has_from, $has_to, $add, $delete);
while (length $diff_in && ($from_count || $to_count)) {
- die "Confused in $hunk" unless $diff_in =~ s/\A([^\n]*)\n//ms;
+ die_255("Confused in $hunk")
+ unless $diff_in =~ s/\A([^\n]*)\n//ms;
my $line = $1;
$line = ' ' unless length $line;
if ($line =~ /^ .*/) {
push @$add, $1;
--$to_count;
} else {
- die "Can't parse '$line' as part of hunk $hunk";
+ die_255("Can't parse '$line' as part of hunk $hunk");
}
}
process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
$delete, $add);
- die "No lines in hunk $hunk"
+ die_255("No lines in hunk $hunk")
unless length $from_out || length $to_out;
- die "No changes in hunk $hunk"
+ die_255("No changes in hunk $hunk")
unless $has_from || $has_to;
$diff_out .= "***************\n";
$diff_out .= "*** $from_start,$from_end ****\n";
if (!defined $use_context) {
my $version = `patch -v 2>&1`;
- die "Can't run `patch -v`, \$?=$?, bailing out"
+ die_255("Can't run `patch -v`, \$?=$?, bailing out")
unless defined $version;
if ($version =~ /Free Software Foundation/) {
$use_context = 0;
# The system patch is older than Linux, and probably older than
# Windows NT.
$use_context = 1;
+ } elsif ($version =~ /Header: patch\.c,v.*\babhinav\b/) {
+ # Thank you HP. No, we have no idea *which* version this is:
+ # $Header: patch.c,v 76.1.1.2.1.3 2001/12/03 12:24:52 abhinav Exp $
+ $use_context = 1;
} else {
# Don't know.
$use_context = 0;
$files = " $1";
}
my $patch_to_use = placate_patch_prog($patch);
- open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
+ open my $fh, '|-', 'patch', '-p1' or die_255("Can't run patch: $!");
print $fh $patch_to_use;
return if close $fh;
print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
print STDERR "\nConverted to a context diff <<'EOCONTEXT'\n${patch_to_use}EOCONTEXT\n"
if $patch_to_use ne $patch;
- die "Can't $what$files: $?, $!";
+ die_255("Can't $what$files: $?, $!");
}
sub apply_commit {
my ($commit, @files) = @_;
my $patch = `git show $commit @files`;
if (!defined $patch) {
- die "Can't get commit $commit for @files: $?" if @files;
- die "Can't get commit $commit: $?";
+ die_255("Can't get commit $commit for @files: $?") if @files;
+ die_255("Can't get commit $commit: $?");
}
apply_patch($patch, "patch $commit", @files ? " for @files" : '');
}
my ($commit, @files) = @_;
my $patch = `git show -R $commit @files`;
if (!defined $patch) {
- die "Can't get revert commit $commit for @files: $?" if @files;
- die "Can't get revert commit $commit: $?";
+ die_255("Can't get revert commit $commit for @files: $?") if @files;
+ die_255("Can't get revert commit $commit: $?");
}
apply_patch($patch, "revert $commit", @files ? " for @files" : '');
}
my ($file, $commit) = @_;
$commit ||= 'blead';
system "git show $commit:$file > $file </dev/null"
- and die "Could not extract $file at revision $commit";
+ and die_255("Could not extract $file at revision $commit");
}
sub check_shebang {
my $file = shift;
return unless -e $file;
if (!-x $file) {
- die "$file is not executable.
+ die_255("$file is not executable.
system($file, ...) is always going to fail.
-Bailing out";
+Bailing out");
}
my $fh = open_or_die($file);
my $line = <$fh>;
return unless $line =~ m{\A#!(/\S+/perl\S*)\s};
- die "$file will always be run by $1
+ die_255("$file will always be run by $1
It won't be tested by the ./perl we build.
If you intended to run it with that perl binary, please change your
test case to
[You may also need to add -- before ./perl to prevent that -Ilib as being
parsed as an argument to bisect.pl]
-Bailing out";
+Bailing out");
}
sub clean {
}
# Not going to assume that system perl is yet new enough to have autodie
-system 'git clean -dxf </dev/null' and die;
+system_or_die('git clean -dxf');
if (!defined $target) {
match_and_exit(undef, @ARGV) if $match;
my $case_insensitive;
{
my ($dev_C, $ino_C) = stat 'Configure';
- die "Could not stat Configure: $!" unless defined $dev_C;
+ die_255("Could not stat Configure: $!") unless defined $dev_C;
my ($dev_c, $ino_c) = stat 'configure';
++$case_insensitive
if defined $dev_c && $dev_C == $dev_c && $ino_C == $ino_c;
patch_Configure();
patch_hints();
+if ($options{'all-fixups'}) {
+ patch_SH();
+ patch_C();
+ patch_ext();
+}
+apply_fixups($options{'early-fixup'});
# if Encode is not needed for the test, you can speed up the bisect by
# excluding it from the runs with -Dnoextensions=Encode
# bail out pretty early on. Configure won't let us override libswanted, but it
# will let us override the entire libs list.
+foreach (@{$options{A}}) {
+ push @paths, $1 if /^libpth=(.*)/s;
+}
+
unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
# Before 1cfa4ec74d4933da, so force the libs list.
foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld
ld sun m crypt sec util c cposix posix ucb BSD)) {
foreach my $dir (@paths) {
- next unless -f "$dir/lib$lib.so";
+ # Note the wonderful consistency of dot-or-not in the config vars:
+ next unless -f "$dir/lib$lib.$Config{dlext}"
+ || -f "$dir/lib$lib$Config{lib_ext}";
push @libs, "-l$lib";
last;
}
# </dev/null because it seems that some earlier versions of Configure can
# call commands in a way that now has them reading from stdin (and hanging)
my $pid = fork;
-die "Can't fork: $!" unless defined $pid;
+die_255("Can't fork: $!") unless defined $pid;
if (!$pid) {
open STDIN, '<', '/dev/null';
# If a file in MANIFEST is missing, Configure asks if you want to
# continue (the default being 'n'). With stdin closed or /dev/null,
# it exits immediately and the check for config.sh below will skip.
+ no warnings; # Don't tell me "statement unlikely to be reached". I know.
exec './Configure', @ARGS;
- die "Failed to start Configure: $!";
+ die_255("Failed to start Configure: $!");
}
waitpid $pid, 0
- or die "wait for Configure, pid $pid failed: $!";
+ or die_255("wait for Configure, pid $pid failed: $!");
-patch_SH();
+patch_SH() unless $options{'all-fixups'};
+apply_fixups($options{'late-fixup'});
if (-f 'config.sh') {
# Emulate noextensions if Configure doesn't support it.
fake_noextensions()
if $major < 10 && $defines{noextensions};
- system './Configure -S </dev/null' and die;
+ system_or_die('./Configure -S');
}
if ($target =~ /config\.s?h/) {
&& extract_from_file('Makefile', qr/\bregen_headers\b/)) {
# regen_headers was added in e50aee73b3d4c555, patch.1m for perl5.001
# It's not worth faking it for earlier revisions.
- system "make regen_headers </dev/null"
- and die;
+ system_or_die('make regen_headers');
}
-patch_C();
-patch_ext();
+unless ($options{'all-fixups'}) {
+ patch_C();
+ patch_ext();
+}
# Parallel build for miniperl is safe
system "$options{make} $j miniperl </dev/null";
undef $expected_file_found;
my $link = readlink $expected_file;
warn "'t/perl' => '$link', not 'perl'";
- die "Could not realink t/perl: $!" unless defined $link;
+ die_255("Could not realink t/perl: $!") unless defined $link;
}
}
if (defined $options{'one-liner'}) {
my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
unshift @ARGV, '-e', $options{'one-liner'};
- unshift @ARGV, '-l' if $options{l};
- unshift @ARGV, '-w' if $options{w};
+ foreach (qw(c l w)) {
+ unshift @ARGV, "-$_" if $options{$_};
+ }
unshift @ARGV, "./$exe", '-Ilib';
}
while (@parts) {
$path .= '/' . shift @parts;
next if -d $path;
- mkdir $path, 0700 or die "Can't create $path: $!";
+ mkdir $path, 0700 or die_255("Can't create $path: $!");
unshift @created_dirs, $path;
}
$fh = open_or_die($pathname, '>');
close_or_die($fh);
- chmod 0, $pathname or die "Can't chmod 0 $pathname: $!";
+ chmod 0, $pathname or die_255("Can't chmod 0 $pathname: $!");
}
return \@missing, \@created_dirs;
}
push @errors,
"Added file $file had sized changed by Configure to $size";
}
- unlink $file or die "Can't unlink $file: $!";
+ unlink $file or die_255("Can't unlink $file: $!");
}
foreach my $dir (@$created_dirs) {
- rmdir $dir or die "Can't rmdir $dir: $!";
+ rmdir $dir or die_255("Can't rmdir $dir: $!");
}
skip("@errors")
if @errors;
my $mips = extract_from_file('Configure',
qr!(''\) if (?:\./)?mips; then)!);
# This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to
- # theld flags if libraries are found there. It shifts the code to set up
- # libpth earlier, and then adds the code to add libpth entries to
+ # the ld flags if libraries are found there. It shifts the code to set
+ # up libpth earlier, and then adds the code to add libpth entries to
# ldflags
# mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g
apply_patch(sprintf <<'EOPATCH', $mips);
edit_file('Configure', sub {
my $code = shift;
$code =~ s/(optstr = ")([^"]+";\s*# getopt-style specification)/$1A:$2/
- or die "Substitution failed";
+ or die_255("Substitution failed");
$code =~ s!^(: who configured the system)!
touch posthint.sh
. ./posthint.sh
$1!ms
- or die "Substitution failed";
+ or die_255("Substitution failed");
return $code;
});
apply_patch(<<'EOPATCH');
EOC
$code =~ s/\n: is a C symbol defined\?\n.*?\neval "\$2=\$tval"'\n\n/$fixed/sm
- or die "substitution failed";
+ or die_255("substitution failed");
return $code;
});
}
} elsif(!extract_from_file('hints/linux.sh',
qr/^sparc-linux\)$/)) {
my $fh = open_or_die('hints/linux.sh', '>>');
- print $fh <<'EOT' or die $!;
+ print $fh <<'EOT' or die_255($!);
case "`uname -m`" in
sparc*)
}
}
+ if ($major < 4 && $^O eq 'hpux'
+ && extract_from_file('sv.c', qr/i = _filbuf\(/)) {
+ apply_patch(<<'EOPATCH');
+diff --git a/sv.c b/sv.c
+index a1f1d60..0a806f1 100644
+--- a/sv.c
++++ b/sv.c
+@@ -2641,7 +2641,7 @@ I32 append;
+
+ FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */
+ FILE_ptr(fp) = ptr;
+- i = _filbuf(fp); /* get more characters */
++ i = __filbuf(fp); /* get more characters */
+ cnt = FILE_cnt(fp);
+ ptr = FILE_ptr(fp); /* reregisterize cnt and ptr */
+
+
+EOPATCH
+ }
+
if ($major == 4 && extract_from_file('scope.c', qr/\(SV\*\)SSPOPINT/)) {
# [PATCH] 5.004_04 +MAINT_TRIAL_1 broken when sizeof(int) != sizeof(void)
# Fixes a bug introduced in 161b7d1635bc830b
}
}
+sub apply_fixups {
+ my $fixups = shift;
+ return unless $fixups;
+ foreach my $file (@$fixups) {
+ my $fh = open_or_die($file);
+ my $line = <$fh>;
+ close_or_die($fh);
+ if ($line =~ /^#!perl\b/) {
+ system $^X, $file
+ and die_255("$^X $file failed: \$!=$!, \$?=$?");
+ } elsif ($line =~ /^#!(\/\S+)/) {
+ system $file
+ and die_255("$file failed: \$!=$!, \$?=$?");
+ } else {
+ if (my ($target, $action, $pattern)
+ = $line =~ m#^(\S+) ([=!])~ /(.*)/#) {
+ if (length $pattern) {
+ next unless -f $target;
+ if ($action eq '=') {
+ next unless extract_from_file($target, $pattern);
+ } else {
+ next if extract_from_file($target, $pattern);
+ }
+ } else {
+ # Avoid the special case meaning of the empty pattern,
+ # and instead use this to simply test for the file being
+ # present or absent
+ if ($action eq '=') {
+ next unless -f $target;
+ } else {
+ next if -f $target;
+ }
+ }
+ }
+ system_or_die("patch -p1 <$file");
+ }
+ }
+}
+
# Local variables:
# cperl-indent-level: 4
# indent-tabs-mode: nil