儲存庫 vbox 的更動 45243

時間撮記:

2013-3-28 下午09:22:12 (12 年 以前)

作者:

vboxsync

訊息:

Use NSStartSearchPathEnumeration + NSDocumentDirectory insted of FSFindFolder because the latter fails if the directory doesn't not exist while the former work like the RTPathUserDocuments docs state.

檔案:

• trunk/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp (修改) (3 筆差異)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
 *******************************************************************************/
 #include <iprt/path.h>
+#include "internal/iprt.h"
+
+#include <iprt/assert.h>
+#include <iprt/string.h>
 #include <iprt/err.h>
-#include <iprt/assert.h>
 
-#include <CoreServices/CoreServices.h>
+#include <NSSystemDirectories.h>
+#include <sys/syslimits.h>
+#ifdef IPRT_USE_CORE_SERVICE_FOR_USER_DOCUMENTS
+# include <CoreServices/CoreServices.h>
+#endif
+
 
 RTDECL(int) RTPathUserDocuments(char *pszPath, size_t cchPath)
@@ -42 +50 @@
     AssertReturn(cchPath, VERR_INVALID_PARAMETER);
 
+    /*
+     * Try NSSystemDirectories first since that works for directories that doesn't exist.
+     */
+    int rc = VERR_PATH_NOT_FOUND;
+    NSSearchPathEnumerationState EnmState = NSStartSearchPathEnumeration(NSDocumentDirectory, NSUserDomainMask);
+    if (EnmState != 0)
+    {
+        char szTmp[PATH_MAX];
+        szTmp[0] = szTmp[PATH_MAX - 1] = '\0';
+        EnmState = NSGetNextSearchPathEnumeration(EnmState, szTmp);
+        if (EnmState != 0)
+        {
+            size_t cchTmp = strlen(szTmp);
+            if (cchTmp >= cchPath)
+                return VERR_BUFFER_OVERFLOW;
+
+            if (szTmp[0] == '~' && szTmp[1] == '/')
+            {
+                /* Expand tilde. */
+                rc = RTPathUserHome(pszPath, cchPath - cchTmp + 2);
+                if (RT_FAILURE(rc))
+                    return rc;
+                rc = RTPathAppend(pszPath, cchPath, &szTmp[2]);
+            }
+            else
+                rc = RTStrCopy(pszPath, cchPath, szTmp);
+            return rc;
+        }
+    }
+
+#ifdef IPRT_USE_CORE_SERVICE_FOR_USER_DOCUMENTS
+    /*
+     * Fall back on FSFindFolder in case the above should fail...
+     */
     FSRef ref;
     OSErr err = FSFindFolder(kOnAppropriateDisk, kDocumentsFolderType, false /* createFolder */, &ref);
-    if (err != noErr)
-        return VERR_PATH_NOT_FOUND;
-
-    err = FSRefMakePath(&ref, (UInt8*)pszPath, cchPath);
-    if (err != noErr)
-        return VERR_PATH_NOT_FOUND;
-
-    return VINF_SUCCESS;
+    if (err == noErr)
+    {
+        err = FSRefMakePath(&ref, (UInt8*)pszPath, cchPath);
+        if (err == noErr)
+            return VINF_SUCCESS;
+    }
+#endif
+    Assert(RT_FAILURE_NP(rc));
+    return rc;
 }