From: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
Date: Sun, 29 Mar 2009 00:20:02 +0000 (+0100)
Subject: Use CreateDirectory() instead of complicating things.
X-Git-Tag: dbus-1.3.1~222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91f5972fa13165a607162ad0789319abbc5384ea;p=thirdparty%2Fdbus.git

Use CreateDirectory() instead of complicating things.

This is Windows sysdeps after all, and _dbus_mkdir() wasn't used anywhere else.
(cherry picked from commit 0bbe3787ce1e9e992f2bcbbdfcab1dcdb0b41f24)
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 34af24ac0..126ffee03 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1432,17 +1432,6 @@ Original CVS version of dbus-sysdeps.c
  */
 
 
-/**
- * @addtogroup DBusInternalsUtils
- * @{
- */
-
-int _dbus_mkdir (const char *path,
-                 mode_t mode)
-{
-  return _mkdir(path);
-}
-
 /**
  * Exit the process, returning the given value.
  *
@@ -2417,9 +2406,9 @@ _dbus_create_directory (const DBusString *filename,
 
   filename_c = _dbus_string_get_const_data (filename);
 
-  if (_dbus_mkdir (filename_c, 0700) < 0)
+  if (!CreateDirectory (filename_c, NULL))
     {
-      if (errno == EEXIST)
+      if (GetLastError () == ERROR_ALREADY_EXISTS)
         return TRUE;
 
       dbus_set_error (error, DBUS_ERROR_FAILED,