Changeset 38579 in vbox for trunk/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp

Timestamp:

Aug 31, 2011 12:19:14 PM (13 years ago)

Author:

vboxsync

Message:

Main/GuestCtrl: Handle files correctly where the file size can be retrieved but content cannot be read due to limited access rights.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp

@@ -539 +539 @@
                 RTFILE hFileDest;
                 int vrc = RTFileOpen(&hFileDest, aTask->strDest.c_str(),
-                                     RTFILE_O_READWRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE);
+                                     RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE);
                 if (RT_FAILURE(vrc))
                     rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
@@ -558 +558 @@
                             if (!aOutputData.size())
                             {
-                                if (cbToRead)
+                                /*
+                                 * Only bitch about an unexpected end of a file when there already
+                                 * was data read from that file. If this was the very first read we can
+                                 * be (almost) sure that this file is not meant to be read by the specified user.
+                                 */
+                                if (   cbTransfered
+                                    && cbToRead)
+                                {
                                     rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
-                                                                         Guest::tr("Unexpected end of file \"%s\" (%u bytes left)"),
-                                                                         aTask->strSource.c_str(), cbToRead);
+                                                                         Guest::tr("Unexpected end of file \"%s\" (%u bytes left, %u bytes written)"),
+                                                                         aTask->strSource.c_str(), cbToRead, cbTransfered);
+                                }
                                 break;
                             }