Michael Jung : unixfs: Use realpath instead of canonicalize_file_name for portability

Alexandre Julliard julliard at wine.codeweavers.com
Thu Feb 2 07:09:15 CST 2006


Module: wine
Branch: refs/heads/master
Commit: dc9789fbddf469a94fe1cb3f3978d968610d126f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=dc9789fbddf469a94fe1cb3f3978d968610d126f

Author: Michael Jung <mjung at iss.tu-darmstadt.de>
Date:   Thu Feb  2 13:20:49 2006 +0100

unixfs: Use realpath instead of canonicalize_file_name for portability
reasons.

---

 dlls/shell32/shfldr_unixfs.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index b0a513a..c0d7f87 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -422,7 +422,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR
     int cDriveSymlinkLen;
     
     TRACE("(pszDosPath=%s, pszCanonicalPath=%p)\n", debugstr_w(pszDosPath), pszCanonicalPath);
-    
+
     if (!pszDosPath || pszDosPath[1] != ':')
         return FALSE;
 
@@ -431,12 +431,10 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR
     pszUnixPath = wine_get_unix_file_name(wszDrive);
     if (!pszUnixPath) return FALSE;
     cDriveSymlinkLen = strlen(pszUnixPath);
-    pElement = canonicalize_file_name(pszUnixPath);
+    pElement = realpath(pszUnixPath, szPath);
     HeapFree(GetProcessHeap(), 0, pszUnixPath);
     if (!pElement) return FALSE;
-    strcpy(szPath, pElement);
     if (szPath[strlen(szPath)-1] != '/') strcat(szPath, "/");
-    free(pElement);
 
     /* Append the part relative to the drive symbolic link target. */
     pszUnixPath = wine_get_unix_file_name(pszDosPath);




More information about the wine-cvs mailing list