GetShortPathName: always erase characters at the end of the new

string, and return only single backslashes.

GetShortPathName: always erase characters at the end of the new
61f572a6 · Uwe Bonnes · Alexandre Julliard · fbace6ee · 61f572a6
Commit 61f572a6 authored Apr 06, 2000 by Uwe Bonnes Committed by Alexandre Julliard Apr 06, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

dos_fs.c files/dos_fs.c +7 -2

No files found.
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -939,8 +939,12 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath,

      /* check for path delimiters and reproduce them */
      if ( longpath[lp] == '\\' || longpath[lp] == '/' ) {
-	tmpshortpath[sp] = longpath[lp];
-	sp++;
+	if (!sp || tmpshortpath[sp-1]!= '\\') 
+        {
+	    /* strip double "\\" */
+	    tmpshortpath[sp] = '\\';
+	    sp++;
+        }
 	lp++;
 	continue;
      }
@@ -967,6 +971,7 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath,
      SetLastError ( ERROR_FILE_NOT_FOUND );
      return 0;
    }
+    tmpshortpath[sp] = 0;

    lstrcpynA ( shortpath, tmpshortpath, shortlen );
    TRACE("returning %s\n", debugstr_a(shortpath) );