Changeset 3694 for trunk/src/kernel32/directory.cpp

Timestamp:

Jun 12, 2000, 4:59:38 PM (25 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/kernel32/directory.cpp (modified) (5 diffs)

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.24 2000-06-12 13:03:00 phaller Exp $ */
+/* $Id: directory.cpp,v 1.25 2000-06-12 14:59:37 phaller Exp $ */
 
 /*
@@ -43 +43 @@
 
 ODINDEBUGCHANNEL(KERNEL32-DIRECTORY)
+
+
+/*****************************************************************************
+ * Local Prototypes                                                          *
+ *****************************************************************************/
 
 
@@ -224 +229 @@
   
   // cut off trailing backslashes
-  if (lpstrDirectory[len - 1] == '\\')
+  if ( (lpstrDirectory[len - 1] == '\\') ||
+       (lpstrDirectory[len - 1] == '/') )
   {
     lstrcpynA(szBuffer,
@@ -236 +242 @@
             lpstrDirectory));
   
-  return(O32_CreateDirectory(szBuffer,
+  // PH Note 2000/06/12:
+  // Creation of an existing directory is NO ERROR it seems.
+  DWORD dwAttr = GetFileAttributesA(lpstrDirectory);
+  if (dwAttr != -1)
+    if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
+    {
+      SetLastError(ERROR_SUCCESS);
+      return TRUE;
+    }
+  
+  return(O32_CreateDirectory(lpstrDirectory,
                              arg2));
 }
@@ -407 +423 @@
   
   // cut off trailing backslashes
-  if (lpstrDirectory[len - 1] == '\\')
+  if ( (lpstrDirectory[len - 1] == '\\') ||
+       (lpstrDirectory[len - 1] == '/') )
   {
     lstrcpynA(szBuffer,