Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make mPath canonical after resolving the symlink. a=mcafee.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@41555 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com
1999-07-29 20:14:42 +00:00
parent a952e199a5
commit 7442fe6354
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/xpcom/io/nsFileSpecUnix.cpp
View File

@@ -225,12 +225,23 @@ nsresult nsFileSpec::ResolveSymlink(PRBool& wasAliased)
resolvedPath[charCount] = '\0';
wasAliased = PR_TRUE;
/* if it's not an absolute path, replace the leaf with what got resolved */
if (resolvedPath[0] != '/') {
/* if it's not an absolute path,
replace the leaf with what got resolved */
if (resolvedPath[0] != '/') {
SetLeafName(resolvedPath);
}
else {
mPath = (char*)&resolvedPath;
}
char* canonicalPath = realpath((const char *)mPath, resolvedPath);
NS_ASSERTION(canonicalPath, "realpath failed");
if (canonicalPath) {
mPath = (char*)&resolvedPath;
}
else {
mPath = (char*)&resolvedPath;
return NS_ERROR_FAILURE;
}
}
@@ -529,10 +540,11 @@ PRUint32 nsFileSpec::GetDiskSpaceAvailable() const
nsDirectoryIterator::nsDirectoryIterator(const nsFileSpec& inDirectory, PRBool resolveSymLinks)
//----------------------------------------------------------------------------------------
: mCurrent(inDirectory)
, mStarting(inDirectory)
, mExists(PR_FALSE)
, mDir(nsnull)
, mResoveSymLinks(resolveSymLinks)
, mStarting(inDirectory)
, mDir(nsnull)
{
mStarting += "sysygy"; // save off the starting directory
mCurrent += "sysygy"; // prepare the path for SetLeafName