Changeset 55614 in vbox for trunk/src

Timestamp:

May 3, 2015 4:25:24 AM (10 years ago)

Author:

vboxsync

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

99987

Message:

Forgot to add the '-L' option to the vbox_stat invocation. Added '--' to the vbox_stat, vbox_mkdir, vbox_mktemp, and vbox_rm invocation so we don't get confused by file/dir names like '--version' and '-h'.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (4 diffs)

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

@@ -733 +733 @@
                 vrc = VERR_BUFFER_OVERFLOW;
         }
+        procInfo.mArguments.push_back("--"); /* '--version' is a valid directory name. */
         procInfo.mArguments.push_back(strPath); /* The directory we want to create. */
     }
@@ -876 +877 @@
             procInfo.mArguments.push_back(strPath);
         }
+        procInfo.mArguments.push_back("--"); /* strTemplate could be '--help'. */
         procInfo.mArguments.push_back(strTemplate);
     }
@@ -1270 +1272 @@
     {
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
+        procInfo.mArguments.push_back("--"); /* strPath could be '--help', which is a valid filename. */
         procInfo.mArguments.push_back(strPath); /* The file we want to remove. */
     }
@@ -1437 +1440 @@
         /* Construct arguments. */
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
+        if (fFollowSymlinks)
+            procInfo.mArguments.push_back(Utf8Str("-L"));
+        procInfo.mArguments.push_back("--"); /* strPath could be '--help', which is a valid filename. */
         procInfo.mArguments.push_back(strPath);
     }