From: Richard Levitte <levitte@openssl.org>
Date: Tue, 13 Mar 2018 20:55:52 +0000 (+0100)
Subject: Remove the temporary file in case it wasn't renamed
X-Git-Tag: OpenSSL_1_1_1-pre3~106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18f8e443738f22f59556aa4dde91f3fdcc324b4e;p=oweals%2Fopenssl.git

Remove the temporary file in case it wasn't renamed

...  also, name it with "-$$" added instead of ".$$"

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5608)
---

diff --git a/util/add-depends.pl b/util/add-depends.pl
index 9a57da23a2..573986d686 100644
--- a/util/add-depends.pl
+++ b/util/add-depends.pl
@@ -12,7 +12,7 @@ use configdata;
 use File::Compare qw(compare_text);
 
 my $buildfile = $config{build_file};
-my $buildfile_new = "$buildfile.$$";
+my $buildfile_new = "$buildfile-$$";
 my $depext = $target{dep_extension} || ".d";
 my @deps =
     grep { -f $_ }
@@ -45,4 +45,6 @@ if (compare_text($buildfile_new, $buildfile) != 0) {
     rename $buildfile_new, $buildfile
         or die "Trying to rename $buildfile_new -> $buildfile: $!\n";
 }
-
+# On VMS, we want to remove all generations of this file, in case there are
+# more than one
+while (unlink $buildfile_new) {}