Changeset 28877 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 28, 2010 7:10:47 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: pathhost changes.

Location:

trunk/src/VBox/Runtime/r3

Files:

• darwin/pathhost-darwin.cpp (copied) (copied from trunk/src/VBox/Runtime/generic/pathhost-generic.cpp ) (4 diffs)
• posix/dir-posix.cpp (modified) (4 diffs)
• posix/fileio-posix.cpp (modified) (3 diffs)
• posix/fs-posix.cpp (modified) (3 diffs)
• posix/path-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Path Convertions, generic.
+ * IPRT - Path Convertions, Darwin.
+ *
+ * On darwin path names on the disk are decomposed using normalization
+ * form D (NFD).  Since this behavior is unique for the Mac, we will precompose
+ * the path name strings we get from the XNU kernel.
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +42 @@
 int rtPathToNative(char **ppszNativePath, const char *pszPath)
 {
-    return RTStrUtf8ToCurrentCP(ppszNativePath, pszPath);
+    /** @todo We should decompose the string here, but the file system will do
+     *        that for us if we don't, so why bother. */
+    *ppszNativePath = (char *)pszPath;
+    return VINF_SUCCESS;
 }
+
 
 int rtPathToNativeEx(char **ppszNativePath, const char *pszPath, const char *pszBasePath)
 {
     NOREF(pszBasePath);
-    return RTStrUtf8ToCurrentCP(ppszNativePath, pszPath);
+    return rtPathToNative(ppszNativePath, pszPath);
 }
 
-void rtPathFreeNative(char *pszNativePath)
+
+void rtPathFreeNative(char *pszNativePath, const char *pszPath)
 {
-    if (pszNativePath)
-        RTStrFree(pszNativePath);
+    Assert((const char *)pszNativePath == pszPath || !pszNativePath);
+    NOREF(pszNativePath);
+    NOREF(pszPath);
 }
 
@@ -56 +66 @@
 int rtPathFromNative(char **pszPath, const char *pszNativePath)
 {
-    return RTStrCurrentCPToUtf8(pszPath, pszNativePath);
+    /** @todo We must compose the codepoints in the string here.  We get file names
+     *        in normalization form D so we'll end up with normalization form C
+     *        whatever approach we take. */
+    return RTStrDupEx(ppszPath, pszNativePath);
 }
 
@@ -63 +76 @@
 {
     NOREF(pszBasePath);
-    return RTStrCurrentCPToUtf8(pszPath, pszNativePath);
+    return rtPathFromNative(ppszPath, pszNativePath);
 }
 

trunk/src/VBox/Runtime/r3/posix/dir-posix.cpp

@@ -70 +70 @@
             && S_ISDIR(s.st_mode);
 
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pszPath);
     }
 
@@ -110 +110 @@
         }
 
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pszPath);
     }
     else
@@ -131 +131 @@
             rc = RTErrConvertFromErrno(errno);
 
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pszPath);
     }
 
@@ -196 +196 @@
             rc = RTErrConvertFromErrno(errno);
 
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pDir->pszPath);
     }
 

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -100 +100 @@
             && S_ISREG(s.st_mode);
 
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pszPath);
     }
 
@@ -212 +212 @@
     int fh = open(pszNativeFilename, fOpenMode, fMode);
     int iErr = errno;
-    rtPathFreeNative(pszNativeFilename);
+    rtPathFreeNative(pszNativeFilename, pszFilename);
 #endif
     if (fh >= 0)
@@ -378 +378 @@
         if (unlink(pszNativeFilename) != 0)
             rc = RTErrConvertFromErrno(errno);
-        rtPathFreeNative(pszNativeFilename);
+        rtPathFreeNative(pszNativeFilename, pszFilename);
     }
     return rc;

trunk/src/VBox/Runtime/r3/posix/fs-posix.cpp

@@ -81 +81 @@
         else
             rc = RTErrConvertFromErrno(errno);
-        rtPathFreeNative(pszNativeFsPath);
+        rtPathFreeNative(pszNativeFsPath, pszFsPath);
     }
 
@@ -115 +115 @@
         else
             rc = RTErrConvertFromErrno(errno);
-        rtPathFreeNative(pszNativeFsPath);
+        rtPathFreeNative(pszNativeFsPath, pszFsPath);
     }
     LogFlow(("RTFsQuerySerial(%p:{%s}, %p:{%RX32}: returns %Rrc\n",
@@ -155 +155 @@
         else
             rc = RTErrConvertFromErrno(errno);
-        rtPathFreeNative(pszNativeFsPath);
+        rtPathFreeNative(pszNativeFsPath, pszFsPath);
     }
 

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -512 +512 @@
         else
             rc = RTErrConvertFromErrno(errno);
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pszPath);
     }
 
@@ -615 +615 @@
             }
         }
-        rtPathFreeNative(pszNativePath);
+        rtPathFreeNative(pszNativePath, pszPath);
     }
 
@@ -789 +789 @@
                      pszSrc, pszDst, fRename, fFileType, rc, errno));
 
-            rtPathFreeNative(pszNativeDst);
+            rtPathFreeNative(pszNativeDst, pszDst);
         }
-        rtPathFreeNative(pszNativeSrc);
+        rtPathFreeNative(pszNativeSrc, pszSrc);
     }
     return rc;