Changeset 35244 in vbox

Timestamp:

Dec 20, 2010 1:46:17 PM (14 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: allow to cat files with size 0 to the guest

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlExec.cpp (modified) (2 diffs)
• VBoxServiceToolBox.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -1618 +1618 @@
         VBoxServiceError("ControlExec: Failed to retrieve exec input command! Error: %Rrc\n", rc);
     }
-    else if (   cbSize <= 0
-             || cbSize >  cbMaxBufSize)
+    else if (cbSize >  cbMaxBufSize)
     {
         VBoxServiceError("ControlExec: Input size is invalid! cbSize=%u\n", cbSize);
@@ -1661 +1660 @@
             if (RT_SUCCESS(rc))
             {
-                if (cbWritten) /* Did we write something? */
+                if (cbWritten || !cbSize) /* Did we write something or was there anything to write at all? */
                 {
                     uStatus = INPUT_STS_WRITTEN;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp

@@ -186 +186 @@
         {
             rc = RTFileRead(hInput, abBuf, sizeof(abBuf), &cbRead);
-            if (RT_SUCCESS(rc) && cbRead)
+            if (RT_SUCCESS(rc))
             {
                 rc = RTFileWrite(hOutput, abBuf, cbRead, NULL /* Try to write all at once! */);
@@ -193 +193 @@
             else
             {
-                if (   cbRead == 0
-                    && rc     == VERR_BROKEN_PIPE)
-                {
+                if (rc == VERR_BROKEN_PIPE)
                     rc = VINF_SUCCESS;
-                }
                 break;
             }