commit 4c5c7e7a048078b4c1445ed8859f9a0fb69475ec
author Alexandre Julliard <julliard@winehq.org> Fri Jun 21 19:00:13 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jun 21 19:00:13 2002 +0000
tree 17202fa367aed13b7eec7a3ddfefce632059948b
parent b7937afab939f13f080867dc6775ded293903d89

Fixed regression caused by previous change.

files/dos_fs.c

diff --git a/files/dos_fs.c b/files/dos_fs.c
index 74be98e..85021ff 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1027,6 +1027,7 @@
     DWORD sp = 0, lp = 0;
     int tmplen, drive;
     UINT flags;
+    BOOL unixabsolute = *longpath == '/';
 
     TRACE("%s\n", debugstr_a(longpath));
 
@@ -1044,12 +1045,21 @@
       return 0;
     }
 
+    /* check for drive letter */
+    if (!unixabsolute && longpath[1] == ':' ) {
+      tmpshortpath[0] = longpath[0];
+      tmpshortpath[1] = ':';
+      sp = 2;
+    }
+
     if ( ( drive = DOSFS_GetPathDrive ( &longpath )) == -1 ) return 0;
     flags = DRIVE_GetFlags ( drive );
 
-    tmpshortpath[0] = drive + 'A';
-    tmpshortpath[1] = ':';
-    sp = 2;
+    if (unixabsolute && drive != DRIVE_GetCurrentDrive()) {
+      tmpshortpath[0] = drive + 'A';
+      tmpshortpath[1] = ':';
+      sp = 2;
+    }
 
     while ( longpath[lp] ) {