commit e97fb4b0d6167510f30a24a46f07b85aa45229a3
author Alexandre Julliard <julliard@winehq.org> Sun Jan 18 23:32:56 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jan 18 23:32:56 2004 +0000
tree 8c596d646c959ce443d3f6de2394854a728580ae
parent 8451240526f5c2a03e1066c13e79dffc9a0bcbe5

Windows rename() needs an unlink() first (reported by Steven
Edwards).

tools/bin2res.c

diff --git a/tools/bin2res.c b/tools/bin2res.c
index e1654a3..68e76cc 100644
--- a/tools/bin2res.c
+++ b/tools/bin2res.c
@@ -183,8 +183,18 @@
     if (inserting)
     {
 	fclose(ftmp);
-	if (c == EOF && rename(tmp_file_name, input_file_name) < 0)
-	    c = '.'; /* force an error */
+	if (c == EOF)
+        {
+            if (rename(tmp_file_name, input_file_name) < 0)
+            {
+                /* try unlinking first, Windows rename is brain-damaged */
+                if (unlink(input_file_name) < 0 || rename(tmp_file_name, input_file_name) < 0)
+                {
+                    unlink(tmp_file_name);
+                    return 0;
+                }
+            }
+        }
 	else unlink(tmp_file_name);
     }