Changeset 27963 in vbox for trunk/src

Timestamp:

Apr 2, 2010 5:13:34 PM (15 years ago)

Author:

vboxsync

Message:

VBoxHeadless/VNC: Fixed two heap bugs in the password list construction. Converted pthread -> iprt. Fixed initialization order warnings.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

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

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

@@ -63 +63 @@
  VBoxHeadless_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxHeadless.dylib
 endif
-ifdef VBOX_WITH_VNC
+ifdef VBOX_WITH_VNC                     # (GPL only)
  VBoxHeadless_DEFS     += VBOX_WITH_VNC
  VBoxHeadless_SOURCES  += FramebufferVNC.cpp

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

@@ -533 +533 @@
              "   -s, -startvm, --startvm <name|uuid>   Start given VM (required argument)\n"
 #ifdef VBOX_WITH_VNC
-             "   -n, -vnc                              Enable the built in VNC server\n"
-             "   -m, -vncport                          TCP port number to use for the VNC server\n"
-             "   -o, -vncpass <pw>                     Set the VNC server password\n"
+             "   -n, --vnc                             Enable the built in VNC server\n"
+             "   -m, --vncport <port>                  TCP port number to use for the VNC server\n"
+             "   -o, --vncpass <pw>                    Set the VNC server password\n"
 #endif
 #ifdef VBOX_WITH_VRDP
@@ -616 +616 @@
     bool        fVNCEnable      = false;
     unsigned    uVNCPort        = 0;          /* default port */
-    char       *pszVNCPassword  = NULL;       /* no password */
+    char const *pszVNCPassword  = NULL;       /* no password */
 #endif
     unsigned fRawR0 = ~0U;
@@ -676 +676 @@
 #endif /* VBOX_WITH_VRDP defined */
 #ifdef VBOX_WITH_VNC
-        { "-vncport", 'm', RTGETOPT_REQ_INT32 },
-        { "-vncpass", 'o', RTGETOPT_REQ_STRING },
-        { "-vnc", 'n', 0 },
+        { "--vncport", 'm', RTGETOPT_REQ_INT32 },
+        { "--vncpass", 'o', RTGETOPT_REQ_STRING },
+        { "--vnc", 'n', 0 },
 #endif /* VBOX_WITH_VNC */
         { "-rawr0", OPT_RAW_R0, 0 },
@@ -742 +742 @@
                 break;
             case 'o':
-                pszVNCPassword = (char*)ValueUnion.psz;
+                pszVNCPassword = ValueUnion.psz;
                 break;
 #endif /* VBOX_WITH_VNC */
@@ -965 +965 @@
         if (fVNCEnable)
         {
-            VNCFB           *pFramebufferVNC;
-
-            pFramebufferVNC = new VNCFB(console, uVNCPort, pszVNCPassword);
+            VNCFB *pFramebufferVNC = new VNCFB(console, uVNCPort, pszVNCPassword);
             rc = pFramebufferVNC->init();
             if (rc != S_OK)