Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/run_shell.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/run_shell.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/libbb/run_shell.c

@@ -37 +37 @@
 static security_context_t current_sid;
 
-void
-renew_current_security_context(void)
+void FAST_FUNC renew_current_security_context(void)
 {
-    if (current_sid)
-        freecon(current_sid);  /* Release old context  */
+    freecon(current_sid);  /* Release old context  */
     getcon(&current_sid);  /* update */
 }
-void
-set_current_security_context(security_context_t sid)
+void FAST_FUNC set_current_security_context(security_context_t sid)
 {
-    if (current_sid)
-        freecon(current_sid);  /* Release old context  */
+    freecon(current_sid);  /* Release old context  */
     current_sid = sid;
 }
@@ -54 +50 @@
 #endif
 
-/* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
-   If COMMAND is nonzero, pass it to the shell with the -c option.
-   If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
-   arguments.  */
-
-void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
+/* Run SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
+ * If COMMAND is nonzero, pass it to the shell with the -c option.
+ * If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
+ * arguments.  */
+void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
 {
     const char **args;
-    int argno = 1;
+    int argno;
     int additional_args_cnt = 0;
 
@@ -70 +65 @@
     args = xmalloc(sizeof(char*) * (4 + additional_args_cnt));
 
-    args[0] = bb_get_last_path_component(xstrdup(shell));
+    if (!shell || !shell[0])
+        shell = DEFAULT_SHELL;
 
+    args[0] = bb_get_last_path_component_nostrip(shell);
     if (loginshell)
         args[0] = xasprintf("-%s", args[0]);
-
+    argno = 1;
     if (command) {
         args[argno++] = "-c";
@@ -84 +81 @@
     }
     args[argno] = NULL;
+
 #if ENABLE_SELINUX
-    if (current_sid && !setexeccon(current_sid)) {
+    if (current_sid)
+        setexeccon(current_sid);
+    if (ENABLE_FEATURE_CLEAN_UP)
         freecon(current_sid);
-        execve(shell, (char **) args, environ);
-    } else
 #endif
     execv(shell, (char **) args);
-    bb_perror_msg_and_die("cannot run %s", shell);
+    bb_perror_msg_and_die("can't execute '%s'", shell);
 }