From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 10 Dec 2011 18:06:55 +0000 (+0000)
Subject: Retry rename operation with a slight delay to workaround problems on
X-Git-Tag: OpenSSL-fips-2_0-rc7~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df0884ffb7cd8042ae901793934de281674aa569;p=oweals%2Fopenssl.git

Retry rename operation with a slight delay to workaround problems on
some versions of Windows.
---

diff --git a/util/fipsas.pl b/util/fipsas.pl
index 1694c59a41..2734a20181 100644
--- a/util/fipsas.pl
+++ b/util/fipsas.pl
@@ -56,7 +56,14 @@ my ($from, $to);
 unlink $tmptarg;
 
 #rename target temporarily
-rename($target, $tmptarg) || die "Can't rename $target";
+my $rencnt = 0;
+# On windows the previous file doesn't always close straight away
+# so retry the rename operation a few times if it fails.
+while (!rename($target, $tmptarg))
+        {
+        sleep 2;
+        die "Can't rename $target" if ($rencnt++ > 10);
+        }
 
 #edit target
 open(IN,$tmptarg) || die "Can't open temporary file";