diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp index 5ec0fe5f6eae..47c9ceaef051 100644 --- a/xpcom/io/nsLocalFileWin.cpp +++ b/xpcom/io/nsLocalFileWin.cpp @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * rights and limitations under the License. * - * The Original Code is Mozilla Communicator client code, - * released March 31, 1998. + * The Original Code is Mozilla Communicator client code, + * released March 31, 1998. * - * The Initial Developer of the Original Code is Netscape Communications + * The Initial Developer of the Original Code is Netscape Communications * Corporation. Portions created by Netscape are * Copyright (C) 1998-1999 Netscape Communications Corporation. All * Rights Reserved. * - * Contributor(s): + * Contributor(s): * Doug Turner */ @@ -77,7 +77,7 @@ public: private: PRLock* mLock; - IPersistFile* mPersistFile; + IPersistFile* mPersistFile; IShellLink* mShellLink; }; @@ -93,11 +93,11 @@ ShortcutResolver::~ShortcutResolver() if (mLock) PR_DestroyLock(mLock); - // Release the pointer to the IPersistFile interface. + // Release the pointer to the IPersistFile interface. if (mPersistFile) - mPersistFile->Release(); - - // Release the pointer to the IShellLink interface. + mPersistFile->Release(); + + // Release the pointer to the IShellLink interface. if(mShellLink) mShellLink->Release(); @@ -113,17 +113,17 @@ ShortcutResolver::Init() if (!mLock) return NS_ERROR_FAILURE; - HRESULT hres = CoCreateInstance(CLSID_ShellLink, - NULL, - CLSCTX_INPROC_SERVER, - IID_IShellLink, - (void**)&mShellLink); - if (SUCCEEDED(hres)) + HRESULT hres = CoCreateInstance(CLSID_ShellLink, + NULL, + CLSCTX_INPROC_SERVER, + IID_IShellLink, + (void**)&mShellLink); + if (SUCCEEDED(hres)) { - // Get a pointer to the IPersistFile interface. - hres = mShellLink->QueryInterface(IID_IPersistFile, (void**)&mPersistFile); + // Get a pointer to the IPersistFile interface. + hres = mShellLink->QueryInterface(IID_IPersistFile, (void**)&mPersistFile); } - + if (mPersistFile == nsnull || mShellLink == nsnull) return NS_ERROR_FAILURE; @@ -131,27 +131,27 @@ ShortcutResolver::Init() } // |out| must be an allocated buffer of size MAX_PATH -nsresult +nsresult ShortcutResolver::Resolve(const WCHAR* in, char* out) { nsAutoLock lock(mLock); - + // see if we can Load the path. - HRESULT hres = mPersistFile->Load(in, STGM_READ); - - if (FAILED(hres)) + HRESULT hres = mPersistFile->Load(in, STGM_READ); + + if (FAILED(hres)) return NS_ERROR_FAILURE; - // Resolve the link. - hres = mShellLink->Resolve(nsnull, SLR_NO_UI ); - - if (FAILED(hres)) + // Resolve the link. + hres = mShellLink->Resolve(nsnull, SLR_NO_UI ); + + if (FAILED(hres)) return NS_ERROR_FAILURE; - WIN32_FIND_DATA wfd; - // Get the path to the link target. - hres = mShellLink->GetPath( out, MAX_PATH, &wfd, SLGP_UNCPRIORITY ); - if (FAILED(hres)) + WIN32_FIND_DATA wfd; + // Get the path to the link target. + hres = mShellLink->GetPath( out, MAX_PATH, &wfd, SLGP_UNCPRIORITY ); + if (FAILED(hres)) return NS_ERROR_FAILURE; return NS_OK; } @@ -178,12 +178,12 @@ static void NS_DestroyShortcutResolver() // static helper functions //----------------------------------------------------------------------------- -// certainly not all the error that can be +// certainly not all the error that can be // encountered, but many of them common ones static nsresult ConvertWinError(DWORD winErr) { nsresult rv; - + switch (winErr) { case ERROR_FILE_NOT_FOUND: @@ -217,7 +217,7 @@ static nsresult ConvertWinError(DWORD winErr) break; case 0: rv = NS_OK; - default: + default: rv = NS_ERROR_FAILURE; } return rv; @@ -227,8 +227,8 @@ static nsresult ConvertWinError(DWORD winErr) static void myLL_II2L(PRInt32 hi, PRInt32 lo, PRInt64 *result) { - PRInt64 a64, b64; // probably could have been done with - // only one PRInt64, but these are macros, + PRInt64 a64, b64; // probably could have been done with + // only one PRInt64, but these are macros, // and I am a wimp. // put hi in the low bits of a64. @@ -243,10 +243,10 @@ myLL_II2L(PRInt32 hi, PRInt32 lo, PRInt64 *result) static void myLL_L2II(PRInt64 result, PRInt32 *hi, PRInt32 *lo ) { - PRInt64 a64, b64; // probably could have been done with - // only one PRInt64, but these are macros, + PRInt64 a64, b64; // probably could have been done with + // only one PRInt64, but these are macros, // and I am a wimp. - + // shift the hi word to the low word, then push it into a long. LL_SHR(a64, result, 32); LL_L2I(*hi, a64); @@ -294,20 +294,20 @@ class nsDirEnumerator : public nsISimpleEnumerator NS_DECL_ISUPPORTS - nsDirEnumerator() : mDir(nsnull) + nsDirEnumerator() : mDir(nsnull) { } - nsresult Init(nsILocalFile* parent) + nsresult Init(nsILocalFile* parent) { nsCAutoString filepath; parent->GetNativeTarget(filepath); - + if (filepath.IsEmpty()) { parent->GetNativePath(filepath); } - + if (filepath.IsEmpty()) { return NS_ERROR_UNEXPECTED; @@ -316,18 +316,18 @@ class nsDirEnumerator : public nsISimpleEnumerator mDir = PR_OpenDir(filepath.get()); if (mDir == nsnull) // not a directory? return NS_ERROR_FAILURE; - - mParent = parent; + + mParent = parent; return NS_OK; } - NS_IMETHOD HasMoreElements(PRBool *result) + NS_IMETHOD HasMoreElements(PRBool *result) { nsresult rv; - if (mNext == nsnull && mDir) + if (mNext == nsnull && mDir) { PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); - if (entry == nsnull) + if (entry == nsnull) { // end of dir entries @@ -342,28 +342,28 @@ class nsDirEnumerator : public nsISimpleEnumerator nsCOMPtr file; rv = mParent->Clone(getter_AddRefs(file)); - if (NS_FAILED(rv)) + if (NS_FAILED(rv)) return rv; - + rv = file->AppendNative(nsDependentCString(entry->name)); - if (NS_FAILED(rv)) + if (NS_FAILED(rv)) return rv; - + // make sure the thing exists. If it does, try the next one. PRBool exists; rv = file->Exists(&exists); - if (NS_FAILED(rv) || !exists) + if (NS_FAILED(rv) || !exists) { - return HasMoreElements(result); + return HasMoreElements(result); } - + mNext = do_QueryInterface(file); } *result = mNext != nsnull; return NS_OK; } - NS_IMETHOD GetNext(nsISupports **result) + NS_IMETHOD GetNext(nsISupports **result) { nsresult rv; PRBool hasMore; @@ -377,9 +377,9 @@ class nsDirEnumerator : public nsISimpleEnumerator return NS_OK; } - virtual ~nsDirEnumerator() + virtual ~nsDirEnumerator() { - if (mDir) + if (mDir) { PRStatus status = PR_CloseDir(mDir); NS_ASSERTION(status == PR_SUCCESS, "close failed"); @@ -419,7 +419,7 @@ nsLocalFile::nsLocalFileConstructor(nsISupports* outer, const nsIID& aIID, void* nsLocalFile* inst = new nsLocalFile(); if (inst == NULL) return NS_ERROR_OUT_OF_MEMORY; - + nsresult rv = inst->QueryInterface(aIID, aInstancePtr); if (NS_FAILED(rv)) { @@ -454,13 +454,13 @@ nsLocalFile::nsLocalFile(const nsLocalFile& other) // ResolvePath // this function will walk the native path of |this| resolving any symbolic // links found. The new resulting path will be placed into mResolvedPath. -nsresult +nsresult nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** resolvedPath) { nsresult rv = NS_OK; PRBool isDir = PR_FALSE; - + // check to see if it is shortcut, i.e., it has ".lnk" in it int filePathLen = strlen(workingPath); PRBool isShortcut = IsShortcut(workingPath, filePathLen); @@ -472,25 +472,25 @@ nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** #endif // Get the native path for |this| - // allocate extra bytes incase we need to append '\\' and '\0' to the - // workingPath, if it is just a drive letter and a colon + // allocate extra bytes incase we need to append '\\' and '\0' to the + // workingPath, if it is just a drive letter and a colon char *filePath = (char *) nsMemory::Alloc(filePathLen+2); if (!filePath) return NS_ERROR_NULL_POINTER; memcpy(filePath, workingPath, filePathLen + 1); - + // We are going to walk the native file path // and stop at each slash. For each partial // path (the string to the left of the slash) // we will check to see if it is a shortcut. // if it is, we will resolve it and continue // with that resolved path. - + // Get the first slash. unsigned char* slash = _mbschr((unsigned char*) filePath, '\\'); - + if (slash == nsnull) { if (nsCRT::IsAsciiAlpha(filePath[0]) && filePath[1] == ':' && filePath[2] == '\0') @@ -509,7 +509,7 @@ nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** return NS_ERROR_FILE_INVALID_PATH; } } - + // We really cant have just a drive letter as // a shortcut, so we will skip the first '\\' @@ -518,7 +518,7 @@ nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** while (slash || resolveTerminal) { // Change the slash into a null so that - // we can use the partial path. It is is + // we can use the partial path. It is is // null, we know it is the terminal node. if (slash) { @@ -533,12 +533,12 @@ nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** else { // something is wrong. we should not have - // both slash being null and resolveTerminal + // both slash being null and resolveTerminal // not set! nsMemory::Free(filePath); return NS_ERROR_NULL_POINTER; } - + // check to see the file is a shortcut by the magic .lnk extension. size_t offset = strlen(filePath) - 4; if ((offset > 0) && (strnicmp( (filePath + offset), ".lnk", 4) == 0)) @@ -560,34 +560,34 @@ nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** if (NS_SUCCEEDED(rv)) { // found a new path. - + // addend a slash on it since it does not come out of GetPath() // with one only if it is a directory. If it is not a directory // and there is more to append, than we have a problem. - + struct stat st; int statrv = stat(temp, &st); - + if (0 == statrv && (_S_IFDIR & st.st_mode)) { strcat(temp, "\\"); isDir = PR_TRUE; } - + if (slash) { // save where we left off. char *carot= (temp + strlen(temp) -1 ); - + // append all the stuff that we have not done. _mbscat((unsigned char*)temp, ++slash); - + slash = (unsigned char*)carot; } nsMemory::Free(filePath); filePath = temp; - + } else { @@ -602,14 +602,14 @@ nsLocalFile::ResolvePath(const char* workingPath, PRBool resolveTerminal, char** ++slash; slash = _mbschr(slash, '\\'); } - } + } // kill any trailing separator char* temp = filePath; int len = strlen(temp) - 1; if((temp[len] == '\\') && (!isDir)) temp[len] = '\0'; - + *resolvedPath = filePath; return rv; } @@ -646,21 +646,21 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) { if (!resolveTerminal) { - mDirty = PR_FALSE; + mDirty = PR_FALSE; return NS_OK; } - + // check to see that this is shortcut, i.e., the leaf is ".lnk" // if the length < 4, then it's not a link. - + int pathLen = strlen(workingFilePath); const char* leaf = workingFilePath + pathLen - 4; - + // if we found the file and we are not following symlinks, then return success. if (!mFollowSymlinks || pathLen < 4 || (stricmp(leaf, ".lnk") != 0)) { - mDirty = PR_FALSE; + mDirty = PR_FALSE; return NS_OK; } } @@ -673,22 +673,22 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) // okay, something is wrong with the working path. We will try to resolve it. char *resolvePath; - - result = ResolvePath(workingFilePath, resolveTerminal, &resolvePath); + + result = ResolvePath(workingFilePath, resolveTerminal, &resolvePath); if (NS_FAILED(result)) return NS_ERROR_FILE_NOT_FOUND; - - mResolvedPath.Assign(resolvePath); + + mResolvedPath.Assign(resolvePath); nsMemory::Free(resolvePath); status = PR_GetFileInfo64(mResolvedPath.get(), &mFileInfo64); - + if ( status == PR_SUCCESS ) - mDirty = PR_FALSE; + mDirty = PR_FALSE; else result = NS_ERROR_FILE_NOT_FOUND; - return result; + return result; } @@ -696,7 +696,7 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) // nsLocalFile::nsIFile,nsILocalFile //----------------------------------------------------------------------------- -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::Clone(nsIFile **file) { // Just copy-construct ourselves @@ -709,11 +709,11 @@ nsLocalFile::Clone(nsIFile **file) return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::InitWithNativePath(const nsACString &filePath) { MakeDirty(); - + nsACString::const_iterator begin, end; filePath.BeginReading(begin); filePath.EndReading(end); @@ -738,36 +738,36 @@ nsLocalFile::InitWithNativePath(const nsACString &filePath) path = ToNewCString(filePath); pathLen = filePath.Length(); } - + if (path == nsnull) return NS_ERROR_FILE_UNRECOGNIZED_PATH; // kill any trailing '\' provided it isn't the second char of DBCS PRInt32 len = pathLen - 1; - if (path[len] == '\\' && (!::IsDBCSLeadByte(path[len-1]) || + if (path[len] == '\\' && (!::IsDBCSLeadByte(path[len-1]) || _mbsrchr((const unsigned char *)path, '\\') == (const unsigned char *)path+len)) { path[len] = '\0'; pathLen = len; } - + mWorkingPath.Adopt(path, pathLen); return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::OpenNSPRFileDesc(PRInt32 flags, PRInt32 mode, PRFileDesc **_retval) { // check to see if it is shortcut, i.e., it has ".lnk" in it PRBool isShortcut = IsShortcut(mWorkingPath.get(), mWorkingPath.Length()); if (!isShortcut && mDirty) - { + { // we will optimize here. If we are not a shortcut and we are opening // a file and we are still dirty, assume that the working path is vaild // and try to open it. The working path will be different from its // resolved path for a shortcut file. - // If it does work, get the stat info via the file descriptor + // If it does work, get the stat info via the file descriptor mResolvedPath.Assign(mWorkingPath); *_retval = PR_Open(mResolvedPath.get(), flags, mode); if (*_retval) @@ -783,13 +783,13 @@ nsLocalFile::OpenNSPRFileDesc(PRInt32 flags, PRInt32 mode, PRFileDesc **_retval) return NS_OK; } } - + nsresult rv = ResolveAndStat(PR_TRUE); if (NS_FAILED(rv) && rv != NS_ERROR_FILE_NOT_FOUND) - return rv; - + return rv; + *_retval = PR_Open(mResolvedPath.get(), flags, mode); - + if (*_retval) return NS_OK; @@ -797,15 +797,15 @@ nsLocalFile::OpenNSPRFileDesc(PRInt32 flags, PRInt32 mode, PRFileDesc **_retval) } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::OpenANSIFileDesc(const char *mode, FILE * *_retval) { nsresult rv = ResolveAndStat(PR_TRUE); if (NS_FAILED(rv) && rv != NS_ERROR_FILE_NOT_FOUND) - return rv; - + return rv; + *_retval = fopen(mResolvedPath.get(), mode); - + if (*_retval) return NS_OK; @@ -814,16 +814,16 @@ nsLocalFile::OpenANSIFileDesc(const char *mode, FILE * *_retval) -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::Create(PRUint32 type, PRUint32 attributes) -{ +{ if (type != NORMAL_FILE_TYPE && type != DIRECTORY_TYPE) return NS_ERROR_FILE_UNKNOWN_TYPE; nsresult rv = ResolveAndStat(PR_FALSE); if (NS_FAILED(rv) && rv != NS_ERROR_FILE_NOT_FOUND) - return rv; - + return rv; + // create directories to target // // A given local file can be either one of these forms: @@ -855,11 +855,11 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes) // skip the first '\\' ++slash; slash = _mbschr(slash, '\\'); - + while (slash) { *slash = '\0'; - + if (!CreateDirectoryA(mResolvedPath.get(), NULL)) { rv = ConvertWinError(GetLastError()); // perhaps the base path already exists, or perhaps we don't have @@ -888,14 +888,14 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes) { if (!CreateDirectoryA(mResolvedPath.get(), NULL)) return ConvertWinError(GetLastError()); - else + else return NS_OK; } return NS_ERROR_FILE_UNKNOWN_TYPE; } - -NS_IMETHODIMP + +NS_IMETHODIMP nsLocalFile::AppendNative(const nsACString &node) { if (node.IsEmpty()) @@ -909,7 +909,7 @@ nsLocalFile::AppendNative(const nsACString &node) return AppendRelativeNativePath(node); } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::AppendRelativeNativePath(const nsACString &node) { // Cannot start with a / or have .. or have / anywhere @@ -931,7 +931,7 @@ nsLocalFile::Normalize() return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetNativeLeafName(nsACString &aLeafName) { aLeafName.Truncate(); @@ -941,7 +941,7 @@ nsLocalFile::GetNativeLeafName(nsACString &aLeafName) return NS_ERROR_FILE_UNRECOGNIZED_PATH; const char* leaf = (const char*) _mbsrchr((const unsigned char*) temp, '\\'); - + // if the working path is just a node without any lashes. if (leaf == nsnull) leaf = temp; @@ -952,11 +952,11 @@ nsLocalFile::GetNativeLeafName(nsACString &aLeafName) return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetNativeLeafName(const nsACString &aLeafName) { MakeDirty(); - + const unsigned char* temp = (const unsigned char*) mWorkingPath.get(); if(temp == nsnull) return NS_ERROR_FILE_UNRECOGNIZED_PATH; @@ -973,7 +973,7 @@ nsLocalFile::SetNativeLeafName(const nsACString &aLeafName) } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetNativePath(nsACString &_retval) { _retval = mWorkingPath; @@ -991,7 +991,7 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const nsAC // resolve shortcust, we must work with the // target. nsCAutoString destPath; - destParent->GetNativeTarget(destPath); + destParent->GetNativeTarget(destPath); destPath.Append("\\"); @@ -1006,7 +1006,7 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const nsAC destPath.Append(newName); } - + if (followSymlinks) { rv = sourceFile->GetNativeTarget(filePath); @@ -1025,19 +1025,19 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const nsAC if (!move) copyOK = CopyFile(filePath.get(), destPath.get(), PR_TRUE); - else + else { - // What we have to do is check to see if the destPath exists. If it - // does, we have to move it out of the say so that MoveFile will - // succeed. However, we don't want to just remove it since MoveFile + // What we have to do is check to see if the destPath exists. If it + // does, we have to move it out of the say so that MoveFile will + // succeed. However, we don't want to just remove it since MoveFile // can fail leaving us without a file. - + nsCAutoString backup; PRFileInfo64 fileInfo64; PRStatus status = PR_GetFileInfo64(destPath.get(), &fileInfo64); if (status == PR_SUCCESS) { - + // the file exists. Check to make sure it is not a directory, // then move it out of the way. if (fileInfo64.type == PR_FILE_FILE) @@ -1046,10 +1046,10 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const nsAC backup.Append(".moztmp"); // remove any existing backup file that we may already have. - // maybe we should be doing some kind of unique naming here, + // maybe we should be doing some kind of unique naming here, // but why bother. remove(backup.get()); - + // move destination file to backup file copyOK = MoveFile(destPath.get(), backup.get()); if (!copyOK) @@ -1062,10 +1062,10 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const nsAC } // move source file to destination file copyOK = MoveFile(filePath.get(), destPath.get()); - + if (!backup.IsEmpty()) { - if (copyOK) + if (copyOK) { // remove the backup copy. remove(backup.get()); @@ -1077,7 +1077,7 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent, const nsAC NS_ASSERTION(backupOk, "move backup failed"); } } - } + } if (!copyOK) // CopyFile and MoveFile returns non-zero if succeeds (backward if you ask me). rv = ConvertWinError(GetLastError()); @@ -1100,7 +1100,7 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol if (!newParentDir) { // no parent was specified. We must rename. - + if (newName.IsEmpty()) return NS_ERROR_INVALID_ARG; @@ -1111,7 +1111,7 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol if (!newParentDir) return NS_ERROR_FILE_DESTINATION_NOT_DIR; - + // make sure it exists and is a directory. Create it if not there. PRBool exists; newParentDir->Exists(&exists); @@ -1141,15 +1141,15 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol return NS_ERROR_OUT_OF_MEMORY; rv = realDest->InitWithNativePath(target); - - if (NS_FAILED(rv)) + + if (NS_FAILED(rv)) return rv; - + return CopyMove(realDest, newName, followSymlinks, move); } } else - { + { return NS_ERROR_FILE_DESTINATION_NOT_DIR; } } @@ -1173,10 +1173,10 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol // create a new target destination in the new parentDir; nsCOMPtr target; rv = newParentDir->Clone(getter_AddRefs(target)); - - if (NS_FAILED(rv)) + + if (NS_FAILED(rv)) return rv; - + nsCAutoString allocatedNewName; if (newName.IsEmpty()) { @@ -1193,20 +1193,20 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol } else { - GetNativeLeafName(allocatedNewName);// this should be the leaf name of the + GetNativeLeafName(allocatedNewName);// this should be the leaf name of the } } else { allocatedNewName = newName; } - + rv = target->AppendNative(allocatedNewName); - if (NS_FAILED(rv)) + if (NS_FAILED(rv)) return rv; allocatedNewName.Truncate(); - + // check if the destination directory already exists target->Exists(&exists); if (!exists) @@ -1251,22 +1251,22 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol dirEnum.GetNext(getter_AddRefs(item)); file = do_QueryInterface(item); if (file) - { + { PRBool isDir, isLink; - + file->IsDirectory(&isDir); file->IsSymlink(&isLink); - + if (move) { if (followSymlinks) return NS_ERROR_FAILURE; - + rv = file->MoveToNative(target, nsCString()); NS_ENSURE_SUCCESS(rv,rv); } else - { + { if (followSymlinks) rv = file->CopyToFollowingLinksNative(target, nsCString()); else @@ -1279,7 +1279,7 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol // in the new directory. so now delete the directory // note, we don't need to do a recursive delete. // MoveTo() is recursive. At this point, - // we've already moved the children of the current folder + // we've already moved the children of the current folder // to the new location. nothing should be left in the folder. if (move) { @@ -1287,16 +1287,16 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol NS_ENSURE_SUCCESS(rv,rv); } } - + // If we moved, we want to adjust this. if (move) { MakeDirty(); - + nsCAutoString newParentPath; newParentDir->GetNativePath(newParentPath); - + if (newParentPath.IsEmpty()) return NS_ERROR_FAILURE; @@ -1304,9 +1304,9 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol { nsCAutoString aFileName; GetNativeLeafName(aFileName); - + InitWithNativePath(newParentPath); - AppendNative(aFileName); + AppendNative(aFileName); } else { @@ -1314,29 +1314,29 @@ nsLocalFile::CopyMove(nsIFile *aParentDir, const nsACString &newName, PRBool fol AppendNative(newName); } } - + return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::CopyToNative(nsIFile *newParentDir, const nsACString &newName) { return CopyMove(newParentDir, newName, PR_FALSE, PR_FALSE); } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::CopyToFollowingLinksNative(nsIFile *newParentDir, const nsACString &newName) { return CopyMove(newParentDir, newName, PR_TRUE, PR_FALSE); } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString &newName) { return CopyMove(newParentDir, newName, PR_FALSE, PR_TRUE); } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::Load(PRLibrary * *_retval) { PRBool isFile; @@ -1344,7 +1344,7 @@ nsLocalFile::Load(PRLibrary * *_retval) if (NS_FAILED(rv)) return rv; - + if (! isFile) return NS_ERROR_FILE_IS_DIRECTORY; @@ -1359,7 +1359,7 @@ nsLocalFile::Load(PRLibrary * *_retval) return NS_ERROR_NULL_POINTER; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::Remove(PRBool recursive) { nsresult rv; @@ -1439,36 +1439,36 @@ nsLocalFile::Remove(PRBool recursive) return rv; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetLastModifiedTime(PRInt64 *aLastModifiedTime) { NS_ENSURE_ARG(aLastModifiedTime); - + *aLastModifiedTime = 0; nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - + // microseconds -> milliseconds *aLastModifiedTime = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetLastModifiedTimeOfLink(PRInt64 *aLastModifiedTime) { NS_ENSURE_ARG(aLastModifiedTime); - + *aLastModifiedTime = 0; nsresult rv = ResolveAndStat(PR_FALSE); - + if (NS_FAILED(rv)) return rv; - + // microseconds -> milliseconds *aLastModifiedTime = mFileInfo64.modifyTime / PR_USEC_PER_MSEC; @@ -1476,14 +1476,14 @@ nsLocalFile::GetLastModifiedTimeOfLink(PRInt64 *aLastModifiedTime) } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetLastModifiedTime(PRInt64 aLastModifiedTime) { return nsLocalFile::SetModDate(aLastModifiedTime, PR_TRUE); } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetLastModifiedTimeOfLink(PRInt64 aLastModifiedTime) { return nsLocalFile::SetModDate(aLastModifiedTime, PR_FALSE); @@ -1493,22 +1493,22 @@ nsresult nsLocalFile::SetModDate(PRInt64 aLastModifiedTime, PRBool resolveTerminal) { nsresult rv = ResolveAndStat(resolveTerminal); - + if (NS_FAILED(rv)) return rv; - + const char *filePath = mResolvedPath.get(); - + HANDLE file = CreateFile( filePath, // pointer to name of the file GENERIC_WRITE, // access (write) mode 0, // share mode NULL, // pointer to security attributes OPEN_EXISTING, // how to create - 0, // file attributes + 0, // file attributes NULL); - + MakeDirty(); - + if (!file) { return ConvertWinError(GetLastError()); @@ -1517,15 +1517,15 @@ nsLocalFile::SetModDate(PRInt64 aLastModifiedTime, PRBool resolveTerminal) FILETIME lft, ft; SYSTEMTIME st; PRExplodedTime pret; - + // PR_ExplodeTime expects usecs... PR_ExplodeTime(aLastModifiedTime * PR_USEC_PER_MSEC, PR_LocalTimeParameters, &pret); - st.wYear = pret.tm_year; + st.wYear = pret.tm_year; st.wMonth = pret.tm_month + 1; // Convert start offset -- Win32: Jan=1; NSPR: Jan=0 - st.wDayOfWeek = pret.tm_wday; - st.wDay = pret.tm_mday; + st.wDayOfWeek = pret.tm_wday; + st.wDay = pret.tm_mday; st.wHour = pret.tm_hour; - st.wMinute = pret.tm_min; + st.wMinute = pret.tm_min; st.wSecond = pret.tm_sec; st.wMilliseconds = pret.tm_usec/1000; @@ -1547,77 +1547,77 @@ nsLocalFile::SetModDate(PRInt64 aLastModifiedTime, PRBool resolveTerminal) return rv; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetPermissions(PRUint32 *aPermissions) { nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - + const char *filePath = mResolvedPath.get(); return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetPermissionsOfLink(PRUint32 *aPermissionsOfLink) { return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetPermissions(PRUint32 aPermissions) { nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - + const char *filePath = mResolvedPath.get(); if( chmod(filePath, aPermissions) == -1 ) return NS_ERROR_FAILURE; - + return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetPermissionsOfLink(PRUint32 aPermissions) { nsresult rv = ResolveAndStat(PR_FALSE); - + if (NS_FAILED(rv)) return rv; - + const char *filePath = mResolvedPath.get(); if( chmod(filePath, aPermissions) == -1 ) return NS_ERROR_FAILURE; - + return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetFileSize(PRInt64 *aFileSize) { NS_ENSURE_ARG(aFileSize); - + *aFileSize = 0; nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - + *aFileSize = mFileInfo64.size; return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetFileSize(PRInt64 aFileSize) { @@ -1625,33 +1625,33 @@ nsLocalFile::SetFileSize(PRInt64 aFileSize) HANDLE hFile; nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - + const char *filePath = mResolvedPath.get(); // Leave it to Microsoft to open an existing file with a function // named "CreateFile". hFile = CreateFile(filePath, - GENERIC_WRITE, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); + GENERIC_WRITE, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); if (hFile == INVALID_HANDLE_VALUE) { MakeDirty(); return NS_ERROR_FAILURE; } - + // Seek to new, desired end of file PRInt32 hi, lo; myLL_L2II(aFileSize, &hi, &lo ); - + status = SetFilePointer(hFile, lo, NULL, FILE_BEGIN); if (status == 0xffffffff) goto error; @@ -1672,31 +1672,31 @@ nsLocalFile::SetFileSize(PRInt64 aFileSize) return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetFileSizeOfLink(PRInt64 *aFileSize) { NS_ENSURE_ARG(aFileSize); - + *aFileSize = 0; nsresult rv = ResolveAndStat(PR_FALSE); - + if (NS_FAILED(rv)) return rv; - + *aFileSize = mFileInfo64.size; return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable) { NS_ENSURE_ARG(aDiskSpaceAvailable); - + ResolveAndStat(PR_FALSE); - + PRInt64 int64; - + LL_I2L(int64 , LONG_MAX); // Check disk space @@ -1704,26 +1704,26 @@ nsLocalFile::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable) ULARGE_INTEGER liFreeBytesAvailableToCaller, liTotalNumberOfBytes, liTotalNumberOfFreeBytes; double nBytes = 0; - BOOL (WINAPI* getDiskFreeSpaceExA)(LPCTSTR lpDirectoryName, + BOOL (WINAPI* getDiskFreeSpaceExA)(LPCTSTR lpDirectoryName, PULARGE_INTEGER lpFreeBytesAvailableToCaller, - PULARGE_INTEGER lpTotalNumberOfBytes, + PULARGE_INTEGER lpTotalNumberOfBytes, PULARGE_INTEGER lpTotalNumberOfFreeBytes) = NULL; HINSTANCE hInst = LoadLibrary("KERNEL32.DLL"); NS_ASSERTION(hInst != NULL, "COULD NOT LOAD KERNEL32.DLL"); if (hInst != NULL) { - getDiskFreeSpaceExA = (BOOL (WINAPI*)(LPCTSTR lpDirectoryName, + getDiskFreeSpaceExA = (BOOL (WINAPI*)(LPCTSTR lpDirectoryName, PULARGE_INTEGER lpFreeBytesAvailableToCaller, - PULARGE_INTEGER lpTotalNumberOfBytes, - PULARGE_INTEGER lpTotalNumberOfFreeBytes)) + PULARGE_INTEGER lpTotalNumberOfBytes, + PULARGE_INTEGER lpTotalNumberOfFreeBytes)) GetProcAddress(hInst, "GetDiskFreeSpaceExA"); FreeLibrary(hInst); } if (getDiskFreeSpaceExA && (*getDiskFreeSpaceExA)(mResolvedPath.get(), - &liFreeBytesAvailableToCaller, - &liTotalNumberOfBytes, + &liFreeBytesAvailableToCaller, + &liTotalNumberOfBytes, &liTotalNumberOfFreeBytes)) { nBytes = (double)(signed __int64)liFreeBytesAvailableToCaller.QuadPart; @@ -1744,7 +1744,7 @@ nsLocalFile::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable) } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetParent(nsIFile * *aParent) { NS_ENSURE_ARG_POINTER(aParent); @@ -1761,7 +1761,7 @@ nsLocalFile::GetParent(nsIFile * *aParent) nsCOMPtr localFile; nsresult rv = NS_NewNativeLocalFile(parentPath, mFollowSymlinks, getter_AddRefs(localFile)); - + if(NS_SUCCEEDED(rv) && localFile) { return CallQueryInterface(localFile, aParent); @@ -1769,42 +1769,42 @@ nsLocalFile::GetParent(nsIFile * *aParent) return rv; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::Exists(PRBool *_retval) { NS_ENSURE_ARG(_retval); MakeDirty(); nsresult rv = ResolveAndStat( PR_TRUE ); - + if (NS_SUCCEEDED(rv)) *_retval = PR_TRUE; - else + else *_retval = PR_FALSE; - + return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsWritable(PRBool *_retval) { NS_ENSURE_ARG(_retval); *_retval = PR_FALSE; - + nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) - return rv; - + return rv; + const char *workingFilePath = mWorkingPath.get(); DWORD word = GetFileAttributes(workingFilePath); - *_retval = !((word & FILE_ATTRIBUTE_READONLY) != 0); + *_retval = !((word & FILE_ATTRIBUTE_READONLY) != 0); return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsReadable(PRBool *_retval) { NS_ENSURE_ARG(_retval); @@ -1819,7 +1819,7 @@ nsLocalFile::IsReadable(PRBool *_retval) } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsExecutable(PRBool *_retval) { NS_ENSURE_ARG(_retval); @@ -1832,11 +1832,11 @@ nsLocalFile::IsExecutable(PRBool *_retval) nsCAutoString path; PRBool symLink; - + rv = IsSymlink(&symLink); if (NS_FAILED(rv)) return rv; - + if (symLink) GetNativeTarget(path); else @@ -1872,12 +1872,12 @@ nsLocalFile::IsExecutable(PRBool *_retval) } } } - + return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsDirectory(PRBool *_retval) { NS_PRECONDITION(_retval, "null pointer"); @@ -1892,29 +1892,29 @@ nsLocalFile::IsDirectory(PRBool *_retval) return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval) { NS_ENSURE_ARG(_retval); *_retval = PR_FALSE; nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - *_retval = (mFileInfo64.type == PR_FILE_FILE); + *_retval = (mFileInfo64.type == PR_FILE_FILE); return rv; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsHidden(PRBool *_retval) { NS_ENSURE_ARG(_retval); *_retval = PR_FALSE; nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; @@ -1930,12 +1930,12 @@ nsLocalFile::IsHidden(PRBool *_retval) word = GetFileAttributes(workingFilePath); } - *_retval = ((word & FILE_ATTRIBUTE_HIDDEN) != 0); + *_retval = ((word & FILE_ATTRIBUTE_HIDDEN) != 0); return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsSymlink(PRBool *_retval) { NS_PRECONDITION(_retval, "null pointer"); @@ -1950,21 +1950,21 @@ nsLocalFile::IsSymlink(PRBool *_retval) return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::IsSpecial(PRBool *_retval) { NS_ENSURE_ARG(_retval); *_retval = PR_FALSE; nsresult rv = ResolveAndStat(PR_TRUE); - + if (NS_FAILED(rv)) return rv; - + const char *workingFilePath = mWorkingPath.get(); DWORD word = GetFileAttributes(workingFilePath); - *_retval = ((word & FILE_ATTRIBUTE_SYSTEM) != 0); + *_retval = ((word & FILE_ATTRIBUTE_SYSTEM) != 0); return NS_OK; } @@ -1977,7 +1977,7 @@ nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval) nsCAutoString inFilePath; inFile->GetNativePath(inFilePath); - + *_retval = inFilePath.Equals(mWorkingPath); return NS_OK; } @@ -1986,13 +1986,13 @@ NS_IMETHODIMP nsLocalFile::Contains(nsIFile *inFile, PRBool recur, PRBool *_retval) { *_retval = PR_FALSE; - + nsCAutoString myFilePath; if ( NS_FAILED(GetNativeTarget(myFilePath))) GetNativePath(myFilePath); - + PRInt32 myFilePathLen = myFilePath.Length(); - + nsCAutoString inFilePath; if ( NS_FAILED(inFile->GetNativeTarget(inFilePath))) inFile->GetNativePath(inFilePath); @@ -2016,11 +2016,11 @@ nsLocalFile::Contains(nsIFile *inFile, PRBool recur, PRBool *_retval) NS_IMETHODIMP nsLocalFile::GetNativeTarget(nsACString &_retval) -{ +{ _retval.Truncate(); -#if STRICT_FAKE_SYMLINKS +#if STRICT_FAKE_SYMLINKS PRBool symLink; - + nsresult rv = IsSymlink(&symLink); if (NS_FAILED(rv)) return rv; @@ -2031,20 +2031,20 @@ nsLocalFile::GetNativeTarget(nsACString &_retval) } #endif ResolveAndStat(PR_TRUE); - + _retval = mResolvedPath; return NS_OK; } /* attribute PRBool followLinks; */ -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::GetFollowLinks(PRBool *aFollowLinks) { *aFollowLinks = mFollowSymlinks; return NS_OK; } -NS_IMETHODIMP +NS_IMETHODIMP nsLocalFile::SetFollowLinks(PRBool aFollowLinks) { MakeDirty(); @@ -2057,12 +2057,12 @@ NS_IMETHODIMP nsLocalFile::GetDirectoryEntries(nsISimpleEnumerator * *entries) { nsresult rv; - + *entries = nsnull; PRBool isDir; rv = IsDirectory(&isDir); - if (NS_FAILED(rv)) + if (NS_FAILED(rv)) return rv; if (!isDir) return NS_ERROR_FILE_NOT_DIRECTORY; @@ -2072,12 +2072,12 @@ nsLocalFile::GetDirectoryEntries(nsISimpleEnumerator * *entries) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(dirEnum); rv = dirEnum->Init(this); - if (NS_FAILED(rv)) + if (NS_FAILED(rv)) { NS_RELEASE(dirEnum); return rv; } - + *entries = dirEnum; return NS_OK; } @@ -2091,7 +2091,7 @@ nsLocalFile::GetPersistentDescriptor(nsACString &aPersistentDescriptor) NS_IMETHODIMP nsLocalFile::SetPersistentDescriptor(const nsACString &aPersistentDescriptor) { - return InitWithNativePath(aPersistentDescriptor); + return InitWithNativePath(aPersistentDescriptor); } NS_IMETHODIMP @@ -2105,7 +2105,7 @@ nsLocalFile::Reveal() IsDirectory(&isDirectory); if (isDirectory) { - GetNativePath(path); + GetNativePath(path); } else { @@ -2113,7 +2113,7 @@ nsLocalFile::Reveal() GetParent(getter_AddRefs(parent)); if (parent) { - parent->GetNativePath(path); + parent->GetNativePath(path); parent->GetPath(unicodePath); } } @@ -2124,7 +2124,7 @@ nsLocalFile::Reveal() // use the app registry name to launch a shell execute.... LONG r = (LONG) ::ShellExecute( NULL, "open", path.get(), NULL, NULL, SW_SHOWNORMAL); - if (r < 32) + if (r < 32) return NS_ERROR_FAILURE; // If this is a directory, then we don't need to select a file. @@ -2275,51 +2275,51 @@ nsLocalFile::Reveal() NS_IMETHODIMP nsLocalFile::Launch() { - nsresult rv = NS_OK; - const nsCString &path = mWorkingPath; + nsresult rv = NS_OK; + const nsCString &path = mWorkingPath; - // use the app registry name to launch a shell execute.... - LONG r = (LONG) ::ShellExecute( NULL, NULL, path.get(), NULL, NULL, SW_SHOWNORMAL); + // use the app registry name to launch a shell execute.... + LONG r = (LONG) ::ShellExecute( NULL, NULL, path.get(), NULL, NULL, SW_SHOWNORMAL); - // if the file has no association, we launch windows' "what do you want to do" dialog - if (r == SE_ERR_NOASSOC) { - nsCAutoString shellArg; - shellArg.Assign(NS_LITERAL_CSTRING("shell32.dll,OpenAs_RunDLL ") + path); - r = (LONG) ::ShellExecute(NULL, NULL, "RUNDLL32.EXE", shellArg.get(), - NULL, SW_SHOWNORMAL); - } - if (r < 32) { - switch (r) { - case 0: - case SE_ERR_OOM: - return NS_ERROR_OUT_OF_MEMORY; - case ERROR_FILE_NOT_FOUND: - return NS_ERROR_FILE_NOT_FOUND; - case ERROR_PATH_NOT_FOUND: - return NS_ERROR_FILE_UNRECOGNIZED_PATH; - case ERROR_BAD_FORMAT: - return NS_ERROR_FILE_CORRUPTED; - case SE_ERR_ACCESSDENIED: - return NS_ERROR_FILE_ACCESS_DENIED; - case SE_ERR_ASSOCINCOMPLETE: - case SE_ERR_NOASSOC: - return NS_ERROR_UNEXPECTED; - case SE_ERR_DDEBUSY: - case SE_ERR_DDEFAIL: - case SE_ERR_DDETIMEOUT: - return NS_ERROR_NOT_AVAILABLE; - case SE_ERR_DLLNOTFOUND: - return NS_ERROR_FAILURE; - case SE_ERR_SHARE: - return NS_ERROR_FILE_IS_LOCKED; - default: - return NS_ERROR_FILE_EXECUTION_FAILED; + // if the file has no association, we launch windows' "what do you want to do" dialog + if (r == SE_ERR_NOASSOC) { + nsCAutoString shellArg; + shellArg.Assign(NS_LITERAL_CSTRING("shell32.dll,OpenAs_RunDLL ") + path); + r = (LONG) ::ShellExecute(NULL, NULL, "RUNDLL32.EXE", shellArg.get(), + NULL, SW_SHOWNORMAL); } - } - return NS_OK; + if (r < 32) { + switch (r) { + case 0: + case SE_ERR_OOM: + return NS_ERROR_OUT_OF_MEMORY; + case ERROR_FILE_NOT_FOUND: + return NS_ERROR_FILE_NOT_FOUND; + case ERROR_PATH_NOT_FOUND: + return NS_ERROR_FILE_UNRECOGNIZED_PATH; + case ERROR_BAD_FORMAT: + return NS_ERROR_FILE_CORRUPTED; + case SE_ERR_ACCESSDENIED: + return NS_ERROR_FILE_ACCESS_DENIED; + case SE_ERR_ASSOCINCOMPLETE: + case SE_ERR_NOASSOC: + return NS_ERROR_UNEXPECTED; + case SE_ERR_DDEBUSY: + case SE_ERR_DDEFAIL: + case SE_ERR_DDETIMEOUT: + return NS_ERROR_NOT_AVAILABLE; + case SE_ERR_DLLNOTFOUND: + return NS_ERROR_FAILURE; + case SE_ERR_SHARE: + return NS_ERROR_FILE_IS_LOCKED; + default: + return NS_ERROR_FILE_EXECUTION_FAILED; + } + } + return NS_OK; } -nsresult +nsresult NS_NewNativeLocalFile(const nsACString &path, PRBool followLinks, nsILocalFile* *result) { nsLocalFile* file = new nsLocalFile(); @@ -2328,7 +2328,7 @@ NS_NewNativeLocalFile(const nsACString &path, PRBool followLinks, nsILocalFile* NS_ADDREF(file); file->SetFollowLinks(followLinks); - + if (!path.IsEmpty()) { nsresult rv = file->InitWithNativePath(path); if (NS_FAILED(rv)) { @@ -2336,7 +2336,7 @@ NS_NewNativeLocalFile(const nsACString &path, PRBool followLinks, nsILocalFile* return rv; } } - + *result = file; return NS_OK; } @@ -2345,29 +2345,29 @@ NS_NewNativeLocalFile(const nsACString &path, PRBool followLinks, nsILocalFile* // UCS2 interface //----------------------------------------------------------------------------- -nsresult +nsresult nsLocalFile::InitWithPath(const nsAString &filePath) { nsCAutoString tmp; nsresult rv = NS_CopyUnicodeToNative(filePath, tmp); if (NS_SUCCEEDED(rv)) return InitWithNativePath(tmp); - + return rv; } -nsresult +nsresult nsLocalFile::Append(const nsAString &node) { nsCAutoString tmp; nsresult rv = NS_CopyUnicodeToNative(node, tmp); if (NS_SUCCEEDED(rv)) return AppendNative(tmp); - + return rv; } -nsresult +nsresult nsLocalFile::AppendRelativePath(const nsAString &node) { nsCAutoString tmp; @@ -2377,68 +2377,68 @@ nsLocalFile::AppendRelativePath(const nsAString &node) return rv; } -nsresult +nsresult nsLocalFile::GetLeafName(nsAString &aLeafName) { nsCAutoString tmp; nsresult rv = GetNativeLeafName(tmp); if (NS_SUCCEEDED(rv)) rv = NS_CopyNativeToUnicode(tmp, aLeafName); - + return rv; } -nsresult +nsresult nsLocalFile::SetLeafName(const nsAString &aLeafName) { nsCAutoString tmp; nsresult rv = NS_CopyUnicodeToNative(aLeafName, tmp); if (NS_SUCCEEDED(rv)) return SetNativeLeafName(tmp); - + return rv; } -nsresult +nsresult nsLocalFile::GetPath(nsAString &_retval) { return NS_CopyNativeToUnicode(mWorkingPath, _retval); } -nsresult +nsresult nsLocalFile::CopyTo(nsIFile *newParentDir, const nsAString &newName) { if (newName.IsEmpty()) return CopyToNative(newParentDir, nsCString()); - + nsCAutoString tmp; nsresult rv = NS_CopyUnicodeToNative(newName, tmp); if (NS_SUCCEEDED(rv)) return CopyToNative(newParentDir, tmp); - + return rv; } -nsresult +nsresult nsLocalFile::CopyToFollowingLinks(nsIFile *newParentDir, const nsAString &newName) { if (newName.IsEmpty()) return CopyToFollowingLinksNative(newParentDir, nsCString()); - + nsCAutoString tmp; nsresult rv = NS_CopyUnicodeToNative(newName, tmp); if (NS_SUCCEEDED(rv)) return CopyToFollowingLinksNative(newParentDir, tmp); - + return rv; } -nsresult +nsresult nsLocalFile::MoveTo(nsIFile *newParentDir, const nsAString &newName) { if (newName.IsEmpty()) return MoveToNative(newParentDir, nsCString()); - + nsCAutoString tmp; nsresult rv = NS_CopyUnicodeToNative(newName, tmp); if (NS_SUCCEEDED(rv)) @@ -2454,11 +2454,11 @@ nsLocalFile::GetTarget(nsAString &_retval) nsresult rv = GetNativeTarget(tmp); if (NS_SUCCEEDED(rv)) rv = NS_CopyNativeToUnicode(tmp, _retval); - + return rv; } -nsresult +nsresult NS_NewLocalFile(const nsAString &path, PRBool followLinks, nsILocalFile* *result) { nsCAutoString buf;