Changeset 84207 in vbox for trunk/src/VBox/Runtime/common/zip/tarvfswriter.cpp

Timestamp:

May 8, 2020 11:54:10 AM (5 years ago)

Author:

vboxsync

Message:

IPRT: Added two flags to the %Rhxs formatter type to control the separator. Default is space, the ' flag changes it to ':' and the # flag removes the separator. bugref:9699

File:

• trunk/src/VBox/Runtime/common/zip/tarvfswriter.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/zip/tarvfswriter.cpp

@@ -2134 +2134 @@
     AssertPtrReturn(phVfsFss, VERR_INVALID_HANDLE);
     *phVfsFss = NIL_RTVFSFSSTREAM;
-    AssertPtrReturn(hVfsFile != NIL_RTVFSFILE, VERR_INVALID_HANDLE);
+    AssertReturn(hVfsFile != NIL_RTVFSFILE, VERR_INVALID_HANDLE);
     AssertReturn(enmFormat > RTZIPTARFORMAT_INVALID && enmFormat < RTZIPTARFORMAT_END, VERR_INVALID_PARAMETER);
     AssertReturn(!(fFlags & ~RTZIPTAR_C_VALID_MASK), VERR_INVALID_FLAGS);
@@ -2159 +2159 @@
     size_t const            cbThis = sizeof(*pThis) + (fFlags & RTZIPTAR_C_UPDATE ? sizeof(*pThis->pRead) : 0);
     RTVFSFSSTREAM           hVfsFss;
-    int rc = RTVfsNewFsStream(&g_rtZipTarFssOps, cbThis, NIL_RTVFS, NIL_RTVFSLOCK, RTFILE_O_WRITE,
+    int rc = RTVfsNewFsStream(&g_rtZipTarFssOps, cbThis, NIL_RTVFS, NIL_RTVFSLOCK,
+                              fFlags & RTZIPTAR_C_UPDATE ? RTFILE_O_READWRITE : RTFILE_O_WRITE,
                               &hVfsFss, (void **)&pThis);
     if (RT_SUCCESS(rc))