儲存庫 vbox 的更動 12343

時間撮記:

2008-9-10 上午10:54:02 (16 年 以前)

作者:

vboxsync

訊息:

VBoxHDD-new: Use RTDirReadEx to get type of the entry and use RTPathAppPrivateArch instead of RTPathSharedLibs

檔案:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (修改) (11 筆差異)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -181 +181 @@
         char *pszPluginName;
 
-        rc = RTPathSharedLibs(szSharedLibPath, sizeof(szSharedLibPath));
+        rc = RTPathAppPrivateArch(szSharedLibPath, sizeof(szSharedLibPath));
         if (RT_FAILURE(rc))
             return rc;
@@ -667 +667 @@
         /* Then enumerate plugin backends. */
         char szPath[RTPATH_MAX];
-        rc = RTPathSharedLibs(szPath, sizeof(szPath));
+        rc = RTPathAppPrivateArch(szPath, sizeof(szPath));
         if (RT_FAILURE(rc))
             break;
@@ -686 +686 @@
             break;
 
-        PRTDIRENTRY pPluginDirEntry = NULL;
+        PRTDIRENTRYEX pPluginDirEntry = NULL;
         unsigned cbPluginDirEntry = sizeof(RTDIRENTRY);
-        pPluginDirEntry = (PRTDIRENTRY)RTMemAllocZ(sizeof(RTDIRENTRY));
+        pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRY));
         if (!pPluginDirEntry)
         {
@@ -695 +695 @@
         }
 
-        while ((rc = RTDirRead(pPluginDir, pPluginDirEntry, &cbPluginDirEntry)) != VERR_NO_MORE_FILES)
+        while ((rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING)) != VERR_NO_MORE_FILES)
         {
             RTLDRMOD hPlugin = NIL_RTLDRMOD;
@@ -706 +706 @@
                 /* allocate new buffer. */
                 RTMemFree(pPluginDirEntry);
-                pPluginDirEntry = (PRTDIRENTRY)RTMemAllocZ(cbPluginDirEntry);
+                pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
                 /* Retry. */
-                rc = RTDirRead(pPluginDir, pPluginDirEntry, &cbPluginDirEntry);
+                rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING);
                 if (RT_FAILURE(rc))
                     break;
@@ -716 +716 @@
 
             /* We got the new entry. */
-            if (pPluginDirEntry->enmType != RTDIRENTRYTYPE_FILE)
+            if (!RTFS_IS_FILE(pPluginDirEntry->Info.Attr.fMode))
                 continue;
 
@@ -952 +952 @@
         /* Then check if plugin backends support this file format. */
         char szPath[RTPATH_MAX];
-        rc = RTPathSharedLibs(szPath, sizeof(szPath));
+        rc = RTPathAppPrivateArch(szPath, sizeof(szPath));
         if (RT_FAILURE(rc))
             break;
@@ -971 +971 @@
             break;
 
-        PRTDIRENTRY pPluginDirEntry = NULL;
+        PRTDIRENTRYEX pPluginDirEntry = NULL;
         unsigned cbPluginDirEntry = sizeof(RTDIRENTRY);
-        pPluginDirEntry = (PRTDIRENTRY)RTMemAllocZ(sizeof(RTDIRENTRY));
+        pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRY));
         if (!pPluginDirEntry)
         {
@@ -980 +980 @@
         }
 
-        while ((rc = RTDirRead(pPluginDir, pPluginDirEntry, &cbPluginDirEntry)) != VERR_NO_MORE_FILES)
+        while ((rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING)) != VERR_NO_MORE_FILES)
         {
             RTLDRMOD hPlugin = NIL_RTLDRMOD;
@@ -991 +991 @@
                 /* allocate new buffer. */
                 RTMemFree(pPluginDirEntry);
-                pPluginDirEntry = (PRTDIRENTRY)RTMemAllocZ(cbPluginDirEntry);
+                pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
                 /* Retry. */
-                rc = RTDirRead(pPluginDir, pPluginDirEntry, &cbPluginDirEntry);
+                rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING);
                 if (RT_FAILURE(rc))
                     break;
@@ -1001 +1001 @@
 
             /* We got the new entry. */
-            if (pPluginDirEntry->enmType != RTDIRENTRYTYPE_FILE)
+            if (!RTFS_IS_FILE(pPluginDirEntry->Info.Attr.fMode))
                 continue;