儲存庫 vbox 的更動 34967

時間撮記:

2010-12-10 下午05:52:01 (14 年 以前)

作者:

vboxsync

訊息:

Moved and extended RTVfsIoStrmValidateUtf8Encoding.

位置:

trunk

檔案:

• include/iprt/vfs.h (修改) (1 筆差異)
• src/VBox/Main/ExtPackUtil.cpp (修改) (1 筆差異)
• src/VBox/Runtime/Makefile.kmk (修改) (1 筆差異)
• src/VBox/Runtime/common/vfs/vfsbase.cpp (修改) (1 筆差異)
• src/VBox/Runtime/common/vfs/vfsiosmisc.cpp (新增)

trunk/include/iprt/vfs.h

@@ -654 +654 @@
  *
  * @param   hVfsIos         The VFS I/O stream handle.
- */
-RTDECL(int)        RTVfsIoStrmValidateUtf8Encoding(RTVFSIOSTREAM hVfsIos);
+ * @param   fFlags          Flags governing the validation, see
+ *                          RTVFS_VALIDATE_UTF8_XXX.
+ * @param   poffError       Where to return the error offset. Optional.
+ */
+RTDECL(int)        RTVfsIoStrmValidateUtf8Encoding(RTVFSIOSTREAM hVfsIos, uint32_t fFlags, PRTFOFF poffError);
+
+/** @defgroup RTVFS_VALIDATE_UTF8_XXX   RTVfsIoStrmValidateUtf8Encoding flags.
+ * @{ */
+/** The text must not contain any null terminator codepoints. */
+#define RTVFS_VALIDATE_UTF8_NO_NULL         RT_BIT_32(0)
+/** The codepoints must be in the range covered by RTC-3629.  */
+#define RTVFS_VALIDATE_UTF8_BY_RTC_3629     RT_BIT_32(1)
+/** Mask of valid flags. */
+#define RTVFS_VALIDATE_UTF8_VALID_MASK      UINT32_C(0x00000003)
+/** @}  */
 
 /** @} */

trunk/src/VBox/Main/ExtPackUtil.cpp

@@ -803 +803 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = RTVfsIoStrmValidateUtf8Encoding(hVfsIos);
+                    rc = RTVfsIoStrmValidateUtf8Encoding(hVfsIos,
+                                                         RTVFS_VALIDATE_UTF8_BY_RTC_3629 | RTVFS_VALIDATE_UTF8_NO_NULL,
+                                                         NULL);
                     if (RT_SUCCESS(rc))
                     {

trunk/src/VBox/Runtime/Makefile.kmk

@@ -398 +398 @@
         common/vfs/vfsbase.cpp \
         common/vfs/vfschain.cpp \
+        common/vfs/vfsiosmisc.cpp \
         common/vfs/vfsmemory.cpp \
         common/vfs/vfsmisc.cpp \

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -2254 +2254 @@
 
 
-RTDECL(int) RTVfsIoStrmValidateUtf8Encoding(RTVFSIOSTREAM hVfsIos)
-{
-    char    achBuf[1024 + 1];
-    size_t  cbUsed = 0;
-    int     rc;
-    for (;;)
-    {
-        /*
-         * Fill the buffer
-         */
-        size_t cbRead = 0;
-        rc = RTVfsIoStrmRead(hVfsIos, &achBuf[cbUsed], sizeof(achBuf) - cbUsed - 1, true /*fBlocking*/, &cbRead);
-        if (RT_FAILURE(rc))
-            break;
-        cbUsed += cbRead;
-        if (!cbUsed)
-        {
-            Assert(rc == VINF_EOF);
-            break;
-        }
-
-        /*
-         * Process the data in the buffer, maybe leaving the final chars till
-         * the next round.
-         */
-/** @todo  implement this */
-    }
-
-    return rc == VINF_EOF ? VINF_SUCCESS : rc;
-}
-
-