Changeset 16395 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Jan 29, 2009 11:38:21 PM (16 years ago)

Author:

vboxsync

Message:

XPCOM-darwin/amd64: Use nsLocalFileUnix.cpp instead of nsLocalFileOSX.cpp; nsLocalFile::InitWithFile fix.

File:

• trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileCommon.cpp (modified) (14 diffs)

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

@@ -62 +62 @@
 }
 
-#if !defined(XP_MAC) && !defined(XP_MACOSX)
+#if (!defined(XP_MAC) && !defined(XP_MACOSX)) || (defined(VBOX) && defined(RT_ARCH_AMD64))
 NS_IMETHODIMP
 nsLocalFile::InitWithFile(nsILocalFile *aFile)
 {
     NS_ENSURE_ARG(aFile);
-    
+
     nsCAutoString path;
     aFile->GetNativePath(path);
     if (path.IsEmpty())
         return NS_ERROR_INVALID_ARG;
-    return InitWithNativePath(path); 
+    return InitWithNativePath(path);
 }
 #endif
@@ -80 +80 @@
 #else
 #define kMaxFilenameLength 255
-#endif  
+#endif
 
 NS_IMETHODIMP
@@ -86 +86 @@
 {
     nsresult rv = Create(type, attributes);
-    
+
     if (NS_SUCCEEDED(rv)) return NS_OK;
     if (rv != NS_ERROR_FILE_ALREADY_EXISTS) return rv;
 
-    nsCAutoString leafName; 
+    nsCAutoString leafName;
     rv = GetNativeLeafName(leafName);
 
@@ -117 +117 @@
 
         rv = Create(type, attributes);
-    
-        if (NS_SUCCEEDED(rv) || rv != NS_ERROR_FILE_ALREADY_EXISTS) 
+
+        if (NS_SUCCEEDED(rv) || rv != NS_ERROR_FILE_ALREADY_EXISTS)
         {
             return rv;
         }
     }
- 
+
     // The disk is full, sort of
     return NS_ERROR_FILE_TOO_BIG;
@@ -150 +150 @@
     PRUnichar **nodePtr = nodeArray;
     if (*path == kPathSeparatorChar)
-      path++;    
+      path++;
     *nodePtr++ = path;
-    
+
     for (PRUnichar *cp = path; *cp != 0; cp++) {
       if (*cp == kPathSeparatorChar) {
@@ -166 +166 @@
 }
 
- 
+
 NS_IMETHODIMP
 nsLocalFile::GetRelativeDescriptor(nsILocalFile *fromFile, nsACString& _retval)
@@ -175 +175 @@
     //
     // _retval will be UTF-8 encoded
-    // 
-        
+    //
+
     nsresult rv;
     _retval.Truncate(0);
@@ -183 +183 @@
     PRUnichar *thisNodes[kMaxNodesInPath], *fromNodes[kMaxNodesInPath];
     PRInt32  thisNodeCnt, fromNodeCnt, nodeIndex;
-    
+
     rv = GetPath(thisPath);
     if (NS_FAILED(rv))
@@ -194 +194 @@
     PRUnichar *thisPathPtr; thisPath.BeginWriting(thisPathPtr);
     PRUnichar *fromPathPtr; fromPath.BeginWriting(fromPathPtr);
-    
+
     thisNodeCnt = SplitPath(thisPathPtr, thisNodes, kMaxNodesInPath);
     fromNodeCnt = SplitPath(fromPathPtr, fromNodes, kMaxNodesInPath);
     if (thisNodeCnt < 0 || fromNodeCnt < 0)
       return NS_ERROR_FAILURE;
-    
+
     for (nodeIndex = 0; nodeIndex < thisNodeCnt && nodeIndex < fromNodeCnt; ++nodeIndex) {
 #ifdef XP_WIN
@@ -209 +209 @@
 #endif
     }
-    
+
     PRInt32 branchIndex = nodeIndex;
-    for (nodeIndex = branchIndex; nodeIndex < fromNodeCnt; nodeIndex++) 
+    for (nodeIndex = branchIndex; nodeIndex < fromNodeCnt; nodeIndex++)
       _retval.AppendLiteral("../");
     for (nodeIndex = branchIndex; nodeIndex < thisNodeCnt; nodeIndex++) {
@@ -222 +222 @@
         _retval.Append('/');
     }
-        
+
     return NS_OK;
 }
@@ -230 +230 @@
 {
     NS_NAMED_LITERAL_CSTRING(kParentDirStr, "../");
- 
+
     nsCOMPtr<nsIFile> targetFile;
     nsresult rv = fromFile->Clone(getter_AddRefs(targetFile));
@@ -238 +238 @@
     //
     // relativeDesc is UTF-8 encoded
-    // 
+    //
 
     nsCString::const_iterator strBegin, strEnd;
     relativeDesc.BeginReading(strBegin);
     relativeDesc.EndReading(strEnd);
-    
+
     nsCString::const_iterator nodeBegin(strBegin), nodeEnd(strEnd);
     nsCString::const_iterator pos(strBegin);
-    
+
     nsCOMPtr<nsIFile> parentDir;
     while (FindInReadable(kParentDirStr, nodeBegin, nodeEnd)) {
@@ -263 +263 @@
       FindCharInReadable('/', nodeEnd, strEnd);
 #ifdef XP_MAC
-      nsCAutoString nodeString(Substring(nodeBegin, nodeEnd));      
+      nsCAutoString nodeString(Substring(nodeBegin, nodeEnd));
       nodeString.ReplaceSubstring(kESCSlashStr, kSlashStr);
       targetFile->Append(NS_ConvertUTF8toUCS2(nodeString));