Changeset 33224 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 19, 2010 8:11:46 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66769

Message:

Storage/vbox-img: fix reading from pipes

File:

• trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -363 +363 @@
     if (pFS->offBuffer == UINT64_MAX)
     {
-        size_t cbRead = 0;
-        rc = RTFileRead(0, &pFS->abBuffer[0], sizeof(pFS->abBuffer),
-                        &cbRead);
-        if (RT_FAILURE(rc))
-            return rc;
+        /* Repeat reading until buffer is full or EOF. */
+        size_t cbSumRead = 0, cbRead;
+        uint8_t *pTmp = (uint8_t *)&pFS->abBuffer[0];
+        size_t cbTmp = sizeof(pFS->abBuffer);
+        do
+        {
+            rc = RTFileRead(0, pTmp, cbTmp, &cbRead);
+            if (RT_FAILURE(rc))
+                return rc;
+            pTmp += cbRead;
+            cbTmp -= cbRead;
+            cbSumRead += cbRead;
+        } while (cbTmp && cbRead);
 
         pFS->offBuffer = 0;
-        pFS->cbBuffer = cbRead;
+        pFS->cbBuffer = cbSumRead;
     }
 
@@ -387 +395 @@
             }
 
-            size_t cbRead = 0;
-            rc = RTFileRead(0, &pFS->abBuffer[0], sizeof(pFS->abBuffer),
-                            &cbRead);
-            if (RT_FAILURE(rc))
+            /* Repeat reading until buffer is full or EOF. */
+            size_t cbSumRead = 0, cbRead;
+            uint8_t *pTmp = (uint8_t *)&pFS->abBuffer[0];
+            size_t cbTmp = sizeof(pFS->abBuffer);
+            do
             {
-                if (pcbRead)
-                    *pcbRead = cbTotalRead;
-                return rc;
-            }
+                rc = RTFileRead(0, pTmp, cbTmp, &cbRead);
+                if (RT_FAILURE(rc))
+                    return rc;
+                pTmp += cbRead;
+                cbTmp -= cbRead;
+                cbSumRead += cbRead;
+            } while (cbTmp && cbRead);
 
             pFS->offBuffer += pFS->cbBuffer;
-            pFS->cbBuffer = cbRead;
+            pFS->cbBuffer = cbSumRead;
         }
 
@@ -413 +425 @@
     if (pcbRead)
         *pcbRead = cbTotalRead;
+
+    pFS->off = uOffset;
 
     return VINF_SUCCESS;