From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 10 Dec 2011 13:29:23 +0000 (+0000)
Subject: use different names for asm temp files to avoid problems on some platforms
X-Git-Tag: OpenSSL-fips-2_0-rc7~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e480d55537be586c806c8d0175c16a3262daf5c;p=oweals%2Fopenssl.git

use different names for asm temp files to avoid problems on some platforms
---

diff --git a/util/fipsas.pl b/util/fipsas.pl
index fc2a759308..1694c59a41 100644
--- a/util/fipsas.pl
+++ b/util/fipsas.pl
@@ -8,6 +8,9 @@ my @ARGS = @ARGV;
 
 my $top = shift @ARGS;
 my $target = shift @ARGS;
+my $tmptarg = $target;
+
+$tmptarg =~ s/\.[^\\\/\.]+$/.tmp/;
 
 my $runasm = 1;
 
@@ -48,11 +51,15 @@ while (<IN>)
 
 my ($from, $to);
 
+#delete any temp file lying around
+
+unlink $tmptarg;
+
 #rename target temporarily
-rename($target, "tmptarg.s") || die "Can't rename $target";
+rename($target, $tmptarg) || die "Can't rename $target";
 
 #edit target
-open(IN,"tmptarg.s") || die "Can't open temporary file";
+open(IN,$tmptarg) || die "Can't open temporary file";
 open(OUT, ">$target") || die "Can't open output file $target";
 
 while (<IN>)
@@ -75,16 +82,12 @@ if ($runasm)
 
 	# restore target
 	unlink $target;
-	rename "tmptarg.s", $target;
+	rename $tmptarg, $target;
 
 	die "Error executing assembler!" if $rv != 0;
 	}
 else
 	{
 	# Don't care about target
-	unlink "tmptarg.s";
+	unlink $tmptarg;
 	}
-
-
-
-