Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 164396 - Change internal representation of file from FSRef to CFURL, reducing conversions between path and FSRef and fixing other bugs. 2nd checkin of this after testing on other Tinderboxen showed Ts improvement. r=sdagley/sr=sfraser

Browse Source
This commit is contained in:
ccarlen%netscape.com 2003-04-18 13:50:38 +00:00
parent abb085458a
commit 35e19dac59
3 changed files with 414 additions and 543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

861
xpcom/io/nsLocalFileOSX.cpp
View File

File diff suppressed because it is too large Load Diff

35
xpcom/io/nsLocalFileOSX.h
View File

@ -43,13 +43,16 @@
#include "nsLocalFile.h"
#include "nsString.h"
#include <deque>
using namespace std;
class nsDirEnumerator;
//*****************************************************************************
// nsLocalFile
//
// The native charset of this implementation is UTF-8. The Unicode used by the
// Mac OS file system is decomposed, so "Native" versions of these routines will
// always use decomposed Unicode. Their "non-Native" counterparts are intended
// to be simple wrappers which call the "Native" version and convert between
// UTF-8 and UCS-2. All the work is done on the "Native" side.
//*****************************************************************************
class NS_COM nsLocalFile : public nsILocalFileMac
@ -75,35 +78,33 @@ public:
static void GlobalShutdown();
protected:
nsLocalFile(const FSRef& aFSRef, const nsAString& aRelativePath);
nsLocalFile(const nsLocalFile& src);
nsresult Resolve();
nsresult GetFSRefInternal(FSRef& aFSSpec);
nsresult SetBaseRef(CFURLRef aCFURLRef); // Does CFRetain on aCFURLRef
nsresult UpdateTargetRef();
nsresult GetFSRefInternal(FSRef& aFSSpec, PRBool bForceUpdateCache = PR_TRUE);
nsresult GetPathInternal(nsACString& path); // Returns path WRT mFollowLinks
nsresult ResolveNonExtantNodes(PRBool aCreateDirs);
nsresult MoveCopy(nsIFile* newParentDir, const nsAString &newName, PRBool isCopy, PRBool followLinks);
static PRInt64 HFSPlustoNSPRTime(const UTCDateTime& utcTime);
static void NSPRtoHFSPlusTime(PRInt64 nsprTime, UTCDateTime& utcTime);
static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
protected:
FSRef mFSRef;
deque<nsString> mNonExtantNodes;
CFURLRef mBaseRef; // The FS object we represent
CFURLRef mTargetRef; // If mBaseRef is an alias, its target
FSRef mTargetFSRef; // If mFSRef is an alias file, its target
FSRef mCachedFSRef;
PRPackedBool mCachedFSRefValid;
PRPackedBool mFollowLinks;
PRPackedBool mIdentityDirty;
PRPackedBool mFollowLinksDirty;
static PRInt64 kJanuaryFirst1970Seconds;
static PRUnichar kPathSepUnichar;
static char kPathSepChar;
static FSRef kInvalidFSRef;
static FSRef kRootFSRef;
static const char kPathSepChar;
static const PRUnichar kPathSepUnichar;
static const PRInt64 kJanuaryFirst1970Seconds;
};
#endif // nsLocalFileMac_h__

1
xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
View File

@ -337,7 +337,6 @@ xptiInterfaceInfoManager::BuildFileList(nsISupportsArray* aSearchPath,
nsCOMPtr<nsILocalFile> file = do_QueryInterface(sup);
if(!file)
return PR_FALSE;
file->SetFollowLinks(PR_FALSE);
PRBool isFile;
if(NS_FAILED(file->IsFile(&isFile)) || !isFile)