Changeset 5692 in vbox

Timestamp:

Nov 11, 2007 5:41:29 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26038

Message:

Updated to current seamonkey head.

File:

• trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileOSX.cpp (modified) (8 diffs)

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileOSX.cpp

@@ -1185 +1185 @@
 
   nsLocalFile* inLF =
-      NS_STATIC_CAST(nsLocalFile*, (nsILocalFileMac*) inMacFile);
+      static_cast<nsLocalFile*>((nsILocalFileMac*) inMacFile);
 
   // If both exist, compare FSRefs
@@ -1256 +1256 @@
   CFURLRef parentURLRef = ::CFURLCreateCopyDeletingLastPathComponent(kCFAllocatorDefault, mBaseRef);
   if (parentURLRef) {
+    // If the parent path is longer than file's path then
+    // CFURLCreateCopyDeletingLastPathComponent must have simply added
+    // two dots at the end - in this case indicate that there is no parent.
+    // See bug 332389.
+    CFStringRef path = ::CFURLGetString(mBaseRef);
+    CFStringRef newPath = ::CFURLGetString(parentURLRef);
+    if (::CFStringGetLength(newPath) < ::CFStringGetLength(path)) {
     rv = NS_ERROR_FAILURE;
     newFile = new nsLocalFile;
@@ -1264 +1271 @@
         rv = NS_OK;
       }
+    }
     }
     ::CFRelease(parentURLRef);
@@ -1594 +1602 @@
   AliasRecord aliasHeader = *(AliasPtr)decodedData;
   PRInt32 aliasSize = GetAliasSizeFromRecord(aliasHeader);
-  if (aliasSize > (dataSize * 3) / 4) { // be paranoid about having too few data
+  if (aliasSize > ((PRInt32)dataSize * 3) / 4) { // be paranoid about having too few data
     PR_Free(decodedData);
     return NS_ERROR_FAILURE;
@@ -1601 +1609 @@
   // Move the now-decoded data into the Handle.
   // The size of the decoded data is 3/4 the size of the encoded data. See plbase64.h
-  Handle        newHandle = nsnull;
+  Handle  newHandle = nsnull;
   if (::PtrToHand(decodedData, &newHandle, aliasSize) != noErr)
     rv = NS_ERROR_OUT_OF_MEMORY;
@@ -2276 +2284 @@
 #if 0 /* bird: too new? */
     aOutStr.SetLength(usedBufLen);
-    if (aOutStr.Length() != usedBufLen)
+    if (aOutStr.Length() != (unsigned int)usedBufLen)
       return NS_ERROR_OUT_OF_MEMORY;
     UInt8 *buffer = (UInt8*) aOutStr.BeginWriting();
@@ -2311 +2319 @@
     nsCAutoString path;
     CFStringReftoUTF8(pathStrRef, path);
+    ::CFRelease(pathStrRef);
     *aResult = HashString(path);
     return NS_OK;
@@ -2405 +2414 @@
 
         case fnfErr:
+        case afpObjectNotFound:
+        case afpDirNotFound:
             outErr = NS_ERROR_FILE_NOT_FOUND;
             break;
 
         case dupFNErr:
+        case afpObjectExists:
             outErr = NS_ERROR_FILE_ALREADY_EXISTS;
             break;
 
         case dskFulErr:
+        case afpDiskFull:
             outErr = NS_ERROR_FILE_DISK_FULL;
             break;
 
         case fLckdErr:
+        case afpVolLocked:
             outErr = NS_ERROR_FILE_IS_LOCKED;
+            break;
+
+        case afpAccessDenied:
+            outErr = NS_ERROR_FILE_ACCESS_DENIED;
+            break;
+
+        case afpDirNotEmpty:
+            outErr = NS_ERROR_FILE_DIR_NOT_EMPTY;
             break;