Changeset 36183 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 7, 2011 10:55:00 AM (14 years ago)

Author:

vboxsync

Message:

VBoxService: Fix for reporting pre-init/terminated status, added -V (--version) for version information reporting.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (8 diffs)

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

@@ -138 +138 @@
              "    -f | --foreground       Don't daemonize the program. For debugging.\n"
              "    -v | --verbose          Increment the verbosity level. For debugging.\n"
+             "    -V | --version          Show version information.\n"
              "    -h | -? | --help        Show this message and exit with status 1.\n"
              );
@@ -577 +578 @@
 #endif
 
-    VBoxServiceReportStatus(VBoxGuestFacilityStatus_PreInit);
-
-    /*
-     * Do pre-init of services.
-     */
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-    {
-        rc = g_aServices[j].pDesc->pfnPreInit();
-        if (RT_FAILURE(rc))
-        {
-            VBoxServiceReportStatus(VBoxGuestFacilityStatus_Failed);
-            return VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
-        }
-    }
-
     /*
      * Parse the arguments.
@@ -615 +601 @@
             else if (MATCHES("verbose"))
                 psz = "v";
+            else if (MATCHES("version"))
+                psz = "V";
             else if (MATCHES("help"))
                 psz = "h";
@@ -682 +670 @@
                     break;
 
+                case 'V':
+                    RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
+                    return RTEXITCODE_SUCCESS;
+
                 case 'h':
                 case '?':
@@ -699 +691 @@
                     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
                     {
-                        rc = g_aServices[j].pDesc->pfnOption(&psz, argc, argv, &i);
-                        fFound = rc == 0;
+                        rc = g_aServices[j].pDesc->pfnPreInit();
+                        if (RT_FAILURE(rc))
+                            return VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName, rc);
+                        else
+                            rc = g_aServices[j].pDesc->pfnOption(&psz, argc, argv, &i);
+                        fFound = rc == VINF_SUCCESS;
                         if (fFound)
                             break;
@@ -781 +777 @@
 #endif
     {
+        VBoxServiceReportStatus(VBoxGuestFacilityStatus_PreInit);
+
         /*
          * Windows: We're running the service as a console application now. Start the
@@ -794 +792 @@
             VBoxServiceMainWait();
         VBoxServiceStopServices();
+
+        /* Only report the "terminated" status when we really did run the internal services --
+         * otherwise we also wrongly would report "terminated" when a user simply
+         * wants to query the version or the command line help. */
+        VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminated);
     }
 
@@ -808 +811 @@
 
     VBoxServiceVerbose(0, "Ended.\n");
-    VBoxServiceReportStatus(VBoxGuestFacilityStatus_Terminated);
     return rcExit;
 }