corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the same path comparison behavior for nsIFile::Equals on all platforms. b=491245 sr=bsmedberg

Browse Source
This commit is contained in:
Josh Aas
2009-07-08 11:26:07 -04:00
parent 0dcd3da69e
commit 37572b9d56
5 changed files with 101 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
xpcom/io/nsLocalFileUnix.cpp
View File

@@ -89,16 +89,6 @@
#include "nsNativeCharsetUtils.h"
#include "nsTraceRefcntImpl.h"
// On some platforms file/directory name comparisons need to
// be case-blind.
#if defined(VMS)
#define FILE_STRCMP strcasecmp
#define FILE_STRNCMP strncasecmp
#else
#define FILE_STRCMP strcmp
#define FILE_STRNCMP strncmp
#endif
#define ENSURE_STAT_CACHE() \
PR_BEGIN_MACRO \
if (!FillStatCache()) \
@@ -1407,13 +1397,14 @@ nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
NS_ENSURE_ARG_POINTER(_retval);
*_retval = PR_FALSE;
nsresult rv;
nsCAutoString inPath;
if (NS_FAILED(rv = inFile->GetNativePath(inPath)))
nsresult rv = inFile->GetNativePath(inPath);
if (NS_FAILED(rv))
return rv;
*_retval = !FILE_STRCMP(inPath.get(), mPath.get());
// We don't need to worry about "/foo/" vs. "/foo" here
// because trailing slashes are stripped on init.
*_retval = !strcmp(inPath.get(), mPath.get());
return NS_OK;
}
@@ -1433,7 +1424,7 @@ nsLocalFile::Contains(nsIFile *inFile, PRBool recur, PRBool *_retval)
*_retval = PR_FALSE;
ssize_t len = mPath.Length();
if (FILE_STRNCMP(mPath.get(), inPath.get(), len) == 0) {
if (strncmp(mPath.get(), inPath.get(), len) == 0) {
// Now make sure that the |inFile|'s path has a separator at len,
// which implies that it has more components after len.
if (inPath[len] == '/')