diff options
author | Manoj Srivastava <srivasta@debian.org> | 2020-05-19 21:29:57 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-19 21:29:57 -0700 |
commit | 11948971f110800dc35b4f6fec90cc01bebd6a7e (patch) | |
tree | d69e6f034efc4ace4c2d573a50153b7a875915f1 /pat/patdiff.SH | |
parent | 7c4aad4e01c8278e073d28a5c1f59b12582431c1 (diff) | |
parent | 50ca5b27f2f7c51d062b3a89d334f7243f467078 (diff) |
Merge branch 'master' into dgit/sidHEADdebian/1%3.5-236-1archive/debian/1%3.5-236-1master
Diffstat (limited to 'pat/patdiff.SH')
-rwxr-xr-x | pat/patdiff.SH | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pat/patdiff.SH b/pat/patdiff.SH index ed4e97b..0c74c9a 100755 --- a/pat/patdiff.SH +++ b/pat/patdiff.SH @@ -49,8 +49,6 @@ $startperl !GROK!THIS! cat >>patdiff <<'!NO!SUBS!' -use File::Temp qw/ tempfile tempdir /; - $RCSEXT = ',v' unless $RCSEXT; $TOPDIR = ''; # We are at top-level directory @@ -161,11 +159,9 @@ foreach $file (@ARGV) { close DIFF; system 'rcs', "-Nlastpat:$new", @files; } else { - my $tmpo = File::Temp->new(); - my $tmpn = File::Temp->new(); - ©right'expand("co -p -rlastpat $file", "$tmpo"); - ©right'expand("co -p -r$new $file", "$tmpn"); - open(DIFF, "$mydiff $tmpo $tmpn |") || + ©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) { @@ -181,7 +177,7 @@ foreach $file (@ARGV) { } close DIFF; system 'rcs', "-Nlastpat:$new", @files; - unlink "$tmpo", "$tmpn"; + unlink "/tmp/pdn$$", "/tmp/pdo$$"; } } else { if ($mydiff eq '') { @@ -195,11 +191,9 @@ foreach $file (@ARGV) { } close DIFF; } else { - my $tmpo = File::Temp->new(); - my $tmpn = File::Temp->new(); - system "co -p -rlastpat $files >$tmpo"; - system "cp $file $tmpn"; - open(DIFF, "$mydiff $tmpo $tmpn |") || + 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 @@ -215,7 +209,7 @@ foreach $file (@ARGV) { print PATCH; } close DIFF; - unlink "$tmpo", "$tmpn"; + unlink "/tmp/pdn$$", "/tmp/pdo$$"; } } } |