commit 61f572a6ea4b6bc619e795670181eddab3c842a9
author Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Thu Apr 06 19:31:11 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Apr 06 19:31:11 2000 +0000
tree b6321c90ad035a4bbc6491f9958d102225a47726
parent fbace6eefee927dca6768c3ef6d6e2d2b9eaa1c5

GetShortPathName: always erase characters at the end of the new
string, and return only single backslashes.

files/dos_fs.c

diff --git a/files/dos_fs.c b/files/dos_fs.c
index 0355f60..e7db742 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -939,8 +939,12 @@
 
       /* 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 @@
       SetLastError ( ERROR_FILE_NOT_FOUND );
       return 0;
     }
+    tmpshortpath[sp] = 0;
 
     lstrcpynA ( shortpath, tmpshortpath, shortlen );
     TRACE("returning %s\n", debugstr_a(shortpath) );