Changeset 80569 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Sep 3, 2019 2:34:21 PM (6 years ago)

Author:

vboxsync

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

133086

Message:

Main: bugref:9341: Added VM autostart during boot support for windows host

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxHeadless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

@@ -46 +46 @@
 VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
 VBoxHeadless_DEFS      += $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,)
-VBoxHeadless_INCS      = $(VBOX_GRAPHICS_INCS)
-VBoxHeadless_SOURCES    = VBoxHeadless.cpp
+VBoxHeadless_INCS      = \
+        $(VBOX_GRAPHICS_INCS) \
+        ../Common
+VBoxHeadless_SOURCES    = \
+        VBoxHeadless.cpp \
+        ../Common/PasswordInput.cpp
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxHeadless_DEFS     += VBOX_WITH_GUEST_PROPS

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -60 +60 @@
 #include <signal.h>
 #endif
+
+#include "PasswordInput.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -525 +527 @@
 }
 #endif /* VBOX_WITH_RECORDING defined */
-
-static RTEXITCODE readPasswordFile(const char *pszFilename, com::Utf8Str *pPasswd)
-{
-    size_t cbFile;
-    char szPasswd[512];
-    int vrc = VINF_SUCCESS;
-    RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
-    bool fStdIn = !strcmp(pszFilename, "stdin");
-    PRTSTREAM pStrm;
-    if (!fStdIn)
-        vrc = RTStrmOpen(pszFilename, "r", &pStrm);
-    else
-        pStrm = g_pStdIn;
-    if (RT_SUCCESS(vrc))
-    {
-        vrc = RTStrmReadEx(pStrm, szPasswd, sizeof(szPasswd)-1, &cbFile);
-        if (RT_SUCCESS(vrc))
-        {
-            if (cbFile >= sizeof(szPasswd)-1)
-            {
-                RTPrintf("Provided password in file '%s' is too long\n", pszFilename);
-                rcExit = RTEXITCODE_FAILURE;
-            }
-            else
-            {
-                unsigned i;
-                for (i = 0; i < cbFile && !RT_C_IS_CNTRL(szPasswd[i]); i++)
-                    ;
-                szPasswd[i] = '\0';
-                *pPasswd = szPasswd;
-            }
-        }
-        else
-        {
-            RTPrintf("Cannot read password from file '%s': %Rrc\n", pszFilename, vrc);
-            rcExit = RTEXITCODE_FAILURE;
-        }
-        if (!fStdIn)
-            RTStrmClose(pStrm);
-    }
-    else
-    {
-        RTPrintf("Cannot open password file '%s' (%Rrc)\n", pszFilename, vrc);
-        rcExit = RTEXITCODE_FAILURE;
-    }
-
-    return rcExit;
-}
-
-static RTEXITCODE settingsPasswordFile(ComPtr<IVirtualBox> virtualBox, const char *pszFilename)
-{
-    com::Utf8Str passwd;
-    RTEXITCODE rcExit = readPasswordFile(pszFilename, &passwd);
-    if (rcExit == RTEXITCODE_SUCCESS)
-    {
-        int rc;
-        CHECK_ERROR(virtualBox, SetSettingsSecret(com::Bstr(passwd).raw()));
-        if (FAILED(rc))
-            rcExit = RTEXITCODE_FAILURE;
-    }
-
-    return rcExit;
-}
-
 
 #ifdef RT_OS_DARWIN