From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 22 Apr 2009 11:32:29 +0000 (+0200)
Subject: dbus/dbus-sysdeps-win.c: use MoveFileEx, not unlink+rename, in _dbus_string_save_to_f... 
X-Git-Tag: dbus-1.3.1~203
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f28b7bb5a552b82598c98f42bd35d1ee1cbab794;p=thirdparty%2Fdbus.git

dbus/dbus-sysdeps-win.c: use MoveFileEx, not unlink+rename, in _dbus_string_save_to_file (cherry picked from commit c31bb3c262db1e6e42ec1bc9a6e8063c625a7cb2)
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 2aec55413..7d9fc4a2b 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2229,8 +2229,8 @@ _dbus_string_save_to_file (const DBusString *str,
 
   fd = -1;
 
-  if ((unlink (filename_c) == -1 && errno != ENOENT) ||
-       rename (tmp_filename_c, filename_c) < 0)
+  /* Unlike rename(), MoveFileEx() can replace existing files */
+  if (MoveFileExA (tmp_filename_c, filename_c, MOVEFILE_REPLACE_EXISTING) < 0)
     {
       dbus_set_error (error, _dbus_error_from_errno (errno),
                       "Could not rename %s to %s: %s",