Changeset 34537 in vbox for trunk/src

Timestamp:

Nov 30, 2010 6:11:51 PM (14 years ago)

Author:

vboxsync

Message:

extpack & manifest bugfixes.

Location:

trunk/src/VBox

Files:

• Main/VBoxExtPackHelperApp.cpp (modified) (3 diffs)
• Runtime/common/checksum/manifest3.cpp (modified) (1 diff)

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -313 +313 @@
         else
             RTMsgError("RTManifestEqualsEx failed: %Rrc", rc);
-#if 1
+#if 0
         RTVFSIOSTREAM hVfsIosStdOut = NIL_RTVFSIOSTREAM;
         RTVfsIoStrmFromStdHandle(RTHANDLESTD_OUTPUT, RTFILE_O_WRITE, true, &hVfsIosStdOut);
@@ -686 +686 @@
                     }
                     else if (*pszAdjName && strcmp(pszAdjName, "."))
-                        rcExit = UnpackExtPackDir(pszAdjName, hVfsObj);
+                        rcExit = UnpackExtPackDir(szDstPath, hVfsObj);
                 }
                 else
@@ -713 +713 @@
                 rc = RTEXITCODE_SUCCESS;
             else if (rc == VERR_NOT_EQUAL && szError[0])
-                RTMsgError("Manifest mismatch: %s", szError);
+                rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Manifest mismatch: %s", szError);
             else
-                RTMsgError("RTManifestEqualsEx failed: %Rrc", rc);
-        }
-
+                rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTManifestEqualsEx failed: %Rrc", rc);
+        }
+#if 0
+        RTVFSIOSTREAM hVfsIosStdOut = NIL_RTVFSIOSTREAM;
+        RTVfsIoStrmFromStdHandle(RTHANDLESTD_OUTPUT, RTFILE_O_WRITE, true, &hVfsIosStdOut);
+        RTVfsIoStrmWrite(hVfsIosStdOut, "Unpack:\n", sizeof("Unpack:\n") - 1, true, NULL);
+        RTManifestWriteStandard(hUnpackManifest, hVfsIosStdOut);
+        RTVfsIoStrmWrite(hVfsIosStdOut, "Valid:\n", sizeof("Valid:\n") - 1, true, NULL);
+        RTManifestWriteStandard(hValidManifest, hVfsIosStdOut);
+#endif
         RTManifestRelease(hUnpackManifest);
     }

trunk/src/VBox/Runtime/common/checksum/manifest3.cpp

@@ -528 +528 @@
                 || RT_FAILURE(rc))
                 break;
-            rtManifestHashesUpdate(pHashes, pvBuf, cbBuf);
+            rtManifestHashesUpdate(pHashes, pvBuf, cbRead);
         }
         if (RT_SUCCESS(rc))