Changeset 34292 in vbox

Timestamp:

Nov 23, 2010 4:06:39 PM (14 years ago)

Author:

vboxsync

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

68046

Message:

Made VBoxManage extpack uninstall <name> work.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• src/VBox/Main/ExtPackManagerImpl.cpp (modified) (4 diffs)
• src/VBox/Main/VBoxExtPackHelperApp.cpp (modified) (7 diffs)

trunk/Config.kmk

@@ -3033 +3033 @@
 #
 # Template for building set-uid-to-root helper programs.
-# These shall have not extra runpaths, esp. not origin ones.
+# In hardened builds, these may only contain absolute runpaths!
 #
 TEMPLATE_VBoxR3SetUidToRoot = Set-uid-to-root helper program.
 TEMPLATE_VBoxR3SetUidToRoot_EXTENDS = VBOXR3HARDENEDEXE
 TEMPLATE_VBoxR3SetUidToRoot_LIBS = $(NO_SUCH_VARIABLE)
+ifdef VBOX_WITH_RUNPATH
+ TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
+endif
+ifndef VBOX_WITH_HARDENING
+ ifdef VBOX_WITH_RELATIVE_RUNPATH
+  TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
+ endif
+ ifdef VBOX_WITH_ORIGIN
+  TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
+ endif
+endif
 
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -890 +890 @@
 int handleExtPack(HandlerArg *a)
 {
-    if (a->argc < 2)
+    if (a->argc < 1)
         return errorSyntax(USAGE_EXTPACK, "Incorrect number of parameters");
 

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -55 +55 @@
  */
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-# define VBOX_EXTPACK_HELPER_NAME       "VBoxExtPackHelper.exe"
+# define VBOX_EXTPACK_HELPER_NAME       "VBoxExtPackHelperApp.exe"
 #else
-# define VBOX_EXTPACK_HELPER_NAME       "VBoxExtPackHelper"
+# define VBOX_EXTPACK_HELPER_NAME       "VBoxExtPackHelperApp"
 #endif
 
@@ -1478 +1478 @@
                                 LogRel(("ExtPackManager: Successfully uninstalled extension pack '%s'.\n", strName.c_str()));
                             else
-                                hrc = setError(E_UNEXPECTED,
+                                hrc = setError(E_FAIL,
                                                tr("Uninstall extension pack '%s' failed under mysterious circumstances"),
                                                strName.c_str());
@@ -1683 +1683 @@
                     hProcess = NIL_RTPROCESS;
                 else
-                    AssertLogRelMsgStmt(vrc != VERR_PROCESS_RUNNING, ("%Rrc\n", vrc), hProcess = NIL_RTPROCESS);
+                    AssertLogRelMsgStmt(vrc == VERR_PROCESS_RUNNING, ("%Rrc\n", vrc), hProcess = NIL_RTPROCESS);
             }
         } while (   hPipeR != NIL_RTPIPE
@@ -1701 +1701 @@
         {
             AssertMsg(ProcStatus.iStatus != 0, ("%s\n", pszStdErrBuf));
-            hrc = setError(E_UNEXPECTED, tr("The installer failed with exit code %d: %s"),
+            hrc = setError(E_FAIL, tr("The installer failed with exit code %d: %s"),
                            ProcStatus.iStatus, offStdErrBuf ? pszStdErrBuf : "");
         }

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -351 +351 @@
     };
     RTGETOPTSTATE   GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
@@ -416 +416 @@
                 return RTGetOptPrintError(ch, &ValueUnion);
         }
-        break;
     }
     if (!pszName)
@@ -462 +461 @@
     };
     RTGETOPTSTATE   GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
@@ -497 +496 @@
                 return RTGetOptPrintError(ch, &ValueUnion);
         }
-        break;
     }
     if (!pszName)
@@ -560 +558 @@
     };
     RTGETOPTSTATE   GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    int rc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /*fFlags*/);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc\n", rc);
@@ -586 +584 @@
                 return RTGetOptPrintError(ch, &ValueUnion);
         }
-        break;
     }
     if (!pszBaseDir)
@@ -679 +676 @@
 
             case CMD_INSTALL:
-                return DoInstall(argc, argv);
+                return DoInstall(  argc - GetState.iNext, argv + GetState.iNext);
 
             case CMD_UNINSTALL:
-                return DoUninstall(argc, argv);
+                return DoUninstall(argc - GetState.iNext, argv + GetState.iNext);
 
             case CMD_CLEANUP:
-                return DoCleanup(argc, argv);
+                return DoCleanup(  argc - GetState.iNext, argv + GetState.iNext);
 
             case 'h':