Merge branch 'topic--unsafe-symlink'

2 files changed, 22 insertions, 14 deletions

diff --git a/pat/patcil.SH b/pat/patcil.SH
index 6e181d3..484673e 100755
--- a/pat/patcil.SH
+++ b/pat/patcil.SH
@@ -61,6 +61,8 @@ $startperl
 !GROK!THIS!
 cat >>patcil <<'!NO!SUBS!'
 
+use File::Temp qw/ tempfile tempdir /;
+
 $progname = &profile;			# Read ~/.dist_profile
 require 'getopts.pl';
 &usage unless $#ARGV >= 0;
@@ -504,12 +506,12 @@ x	Toggle patch# prefix.
 
 sub edit {
 	local($text) = join("\n", @_);
-	open(TMP,">/tmp/cil$$") || die "Can't create /tmp/cil$$";
-	print TMP $text;
-	close TMP;
-	system $EDITOR, "/tmp/cil$$";
-	$text = `cat /tmp/cil$$`;
-	unlink "/tmp/cil$$";
+        my $tmp = File::Temp->new();
+	print $tmp $text;
+	close $tmp;
+	system $EDITOR, "$tmp";
+	$text = `cat "$tmp"`;
+	unlink "$tmp";
 	$text;
 }
 
diff --git a/pat/patdiff.SH b/pat/patdiff.SH
index 33ba90c..846b058 100755
--- a/pat/patdiff.SH
+++ b/pat/patdiff.SH
@@ -49,6 +49,8 @@ $startperl
 !GROK!THIS!
 cat >>patdiff <<'!NO!SUBS!'
 
+use File::Temp qw/ tempfile tempdir /;
+
 $RCSEXT = ',v' unless $RCSEXT;
 $TOPDIR = '';			# We are at top-level directory
 
@@ -159,9 +161,11 @@ foreach $file (@ARGV) {
 				close DIFF;
 				system 'rcs', "-Nlastpat:$new", @files;
 			} else {
-				&copyright'expand("co -p -rlastpat $file", "/tmp/pdo$$");
-				&copyright'expand("co -p -r$new $file", "/tmp/pdn$$");
-				open(DIFF, "$mydiff /tmp/pdo$$ /tmp/pdn$$ |") ||
+                                my $tmpo = File::Temp->new();
+                                my $tmpn = File::Temp->new();
+				&copyright'expand("co -p -rlastpat $file", "$tmpo");
+				&copyright'expand("co -p -r$new $file", "$tmpn");
+				open(DIFF, "$mydiff $tmpo $tmpn |") ||
 				die "Can't run $mydiff";
 				while (<DIFF>) {			# Contextual or unified diff
 					if ($. == 1) {
@@ -177,7 +181,7 @@ foreach $file (@ARGV) {
 				}
 				close DIFF;
 				system 'rcs', "-Nlastpat:$new", @files;
-				unlink "/tmp/pdn$$", "/tmp/pdo$$";
+				unlink "$tmpo", "$tmpn";
 			}
 		} else {
 			if ($mydiff eq '') {
@@ -191,9 +195,11 @@ foreach $file (@ARGV) {
 				}
 				close DIFF;
 			} else {
-				system "co -p -rlastpat $files >/tmp/pdo$$";
-				system "cp $file /tmp/pdn$$";
-				open(DIFF, "$mydiff /tmp/pdo$$ /tmp/pdn$$ |") ||
+                                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 |") ||
 				die "$progname: can't fork $mydiff: $!\n";
 				while (<DIFF>) {
 					# Contextual or unified diff
@@ -209,7 +215,7 @@ foreach $file (@ARGV) {
 					print PATCH;
 				}
 				close DIFF;
-				unlink "/tmp/pdn$$", "/tmp/pdo$$";
+				unlink "$tmpo", "$tmpn";
 			}
 		}
 	}