Changeset 21674 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Jul 28, 2011, 4:46:16 PM (14 years ago)

Author:

dmik

Message:

GetFileAttributesEx: Accept paths with trailing slashes.

The Win32 version of GetFileAttributesEx() treats paths like
'some\path\' as if they were 'some\path' -- hence Odin should
behave the same instead of always returning a failure on such
paths (PATH_NOT_FOUND) as DosQueryPathInfo does on OS/2.

This in particular fixes the Log command on repository roots
in SmartGit (OpenJDK).

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (1 diff)

trunk/src/kernel32/oslibdos.cpp

@@ -807 +807 @@
   CharToOemA(ODINHelperStripUNC(pszName), pszOemName);
 
-  // Treat 'x:' as 'x:\', this is what GetFileAttributesEx() does on Win32
-  // instead of returning an error as DosQueryPathInfo() does
-  if (pszOemName[1] == ':' && pszOemName[2] == '\0') {
-    pszOemName[2] = '\\';
-    pszOemName[3] = '\0';
+  // Treat 'x:' as 'x:\' and 'some\path\' as 'some\path' -- this is what
+  // GetFileAttributesEx() does on Win32 -- instead of returning an error as
+  // DosQueryPathInfo() does
+  if (pszOemName[1] == ':' && pszOemName[2] == '\0')
+  {
+      pszOemName[2] = '\\';
+      pszOemName[3] = '\0';
+  }
+  else
+  {
+      int len = strlen(pszOemName);
+      // note: the below leaves '\' (i.e. the root dir) as is
+      while (len > 1 && (pszOemName[len-1] == '\\' || pszOemName[len-1] == '/'))
+          pszOemName[--len] = '\0';
   }