ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unixfs: Use realpath instead of canonicalize_file_name for portability 

reasons.
This commit is contained in:
Michael Jung 2006-02-02 13:20:49 +01:00 committed by Alexandre Julliard
parent 9f100c15dc
commit dc9789fbdd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/shell32/shfldr_unixfs.c
View File

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