Changeset 34964 in vbox for trunk

Timestamp:

Dec 10, 2010 5:18:30 PM (14 years ago)

Author:

vboxsync

Message:

Added RTVfsIoStrmValidateUtf8Encoding (stubbed).

Location:

trunk

Files:

• include/iprt/vfs.h (modified) (6 diffs)
• src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (1 diff)

trunk/include/iprt/vfs.h

@@ -479 +479 @@
  * @sa      RTVfsFileToIoStream
  */
-RTDECL(RTVFSFILE) RTVfsIoStrmToFile(RTVFSIOSTREAM hVfsIos);
+RTDECL(RTVFSFILE)   RTVfsIoStrmToFile(RTVFSIOSTREAM hVfsIos);
 
 /**
@@ -490 +490 @@
  * @sa      RTFileQueryInfo
  */
-RTDECL(int) RTVfsIoStrmQueryInfo(RTVFSIOSTREAM hVfsIos, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr);
+RTDECL(int)         RTVfsIoStrmQueryInfo(RTVFSIOSTREAM hVfsIos, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr);
 
 /**
@@ -520 +520 @@
  *          RTSocketRead
  */
-RTDECL(int) RTVfsIoStrmRead(RTVFSIOSTREAM hVfsIos, void *pvBuf, size_t cbToRead, bool fBlocking, size_t *pcbRead);
+RTDECL(int)         RTVfsIoStrmRead(RTVFSIOSTREAM hVfsIos, void *pvBuf, size_t cbToRead, bool fBlocking, size_t *pcbRead);
 
 /**
@@ -538 +538 @@
  *          RTSocketWrite
  */
-RTDECL(int) RTVfsIoStrmWrite(RTVFSIOSTREAM hVfsIos, const void *pvBuf, size_t cbToWrite, bool fBlocking, size_t *pcbWritten);
+RTDECL(int)         RTVfsIoStrmWrite(RTVFSIOSTREAM hVfsIos, const void *pvBuf, size_t cbToWrite, bool fBlocking, size_t *pcbWritten);
 
 /**
@@ -610 +610 @@
  * @sa      RTVfsFilePoll, RTPollSetAdd, RTPoll, RTPollNoResume.
  */
-RTDECL(int)      RTVfsIoStrmPoll(RTVFSIOSTREAM hVfsIos, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                                 uint32_t *pfRetEvents);
+RTDECL(int)         RTVfsIoStrmPoll(RTVFSIOSTREAM hVfsIos, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
+                                    uint32_t *pfRetEvents);
 /**
  * Tells the current I/O stream position.
@@ -647 +647 @@
  */
 RTDECL(bool)        RTVfsIoStrmIsAtEnd(RTVFSIOSTREAM hVfsIos);
+
+/**
+ * Process the rest of the stream, checking if it's all valid UTF-8 encoding.
+ *
+ * @returns VBox status cod.e
+ *
+ * @param   hVfsIos         The VFS I/O stream handle.
+ */
+RTDECL(int)        RTVfsIoStrmValidateUtf8Encoding(RTVFSIOSTREAM hVfsIos);
+
 /** @} */
 

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;
+}
+