Changeset 68183 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 31, 2017 8:25:25 AM (7 years ago)

Author:

vboxsync

Message:

IPRT: Added new RTFileReadAll* flag RTFILE_RDALL_F_TRAILING_ZERO_BYTE for simplify reading in text files and treating the result as a zero terminated string.

Location:

trunk/src/VBox/Runtime

Files:

• common/fs/isomaker.cpp (modified) (3 diffs)
• generic/RTFileReadAllByHandleEx-generic.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/fs/isomaker.cpp

@@ -38 +38 @@
 #include <iprt/err.h>
 #include <iprt/ctype.h>
+#include <iprt/md5.h>
 #include <iprt/file.h>
 #include <iprt/list.h>
@@ -46 +47 @@
 #include <iprt/vfs.h>
 #include <iprt/vfslowlevel.h>
+#include <iprt/zero.h>
 #include <iprt/formats/iso9660.h>
 
@@ -5107 +5109 @@
     }
 
+#if 0 /* this doesn't quite fool it. */
+    /*
+     * isomd5sum fake.
+     */
+    if (1)
+    {
+        uint8_t      abDigest[RTMD5_HASH_SIZE];
+        if (pThis->cbSysArea == 0)
+            RTMd5(g_abRTZero4K, ISO9660_SECTOR_SIZE, abDigest);
+        else
+        {
+            RTMD5CONTEXT Ctx;
+            RTMd5Init(&Ctx);
+            RTMd5Update(&Ctx, pThis->pbSysArea, RT_MIN(pThis->cbSysArea, ISO9660_SECTOR_SIZE));
+            if (pThis->cbSysArea < ISO9660_SECTOR_SIZE)
+                RTMd5Update(&Ctx, g_abRTZero4K, ISO9660_SECTOR_SIZE - pThis->cbSysArea);
+            RTMd5Final(abDigest, &Ctx);
+        }
+        char szFakeHash[RTMD5_DIGEST_LEN + 1];
+        RTMd5ToString(abDigest, szFakeHash, sizeof(szFakeHash));
+
+        size_t cch = RTStrPrintf((char *)&pPrimary->abAppUse[0], sizeof(pPrimary->abAppUse),
+                                 "ISO MD5SUM = %s;SKIPSECTORS = %u;RHLISOSTATUS=1;THIS IS JUST A FAKE!",
+                                 szFakeHash, pThis->cbFinalizedImage / RTFSISOMAKER_SECTOR_SIZE - 1);
+        memset(&pPrimary->abAppUse[cch], ' ', sizeof(pPrimary->abAppUse) - cch);
+    }
+#endif
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp

@@ -65 +65 @@
                  * Try allocate the required memory and initialize the header (hardcoded fun).
                  */
-                void *pvHdr = RTMemAlloc(cbAllocMem + 32);
+                void *pvHdr = RTMemAlloc(cbAllocMem + 32 + (fFlags & RTFILE_RDALL_F_TRAILING_ZERO_BYTE ? 1 : 0));
                 if (pvHdr)
                 {
@@ -81 +81 @@
                         if (RT_SUCCESS(rc))
                         {
+                            if (fFlags & RTFILE_RDALL_F_TRAILING_ZERO_BYTE)
+                                ((uint8_t *)pvFile)[cbAllocFile] = '\0';
+
                             /*
                              * Success - fill in the return values.