Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/run_shell.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/run_shell.c (modified) (3 diffs)

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

@@ -29 +29 @@
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <ctype.h>
 #include "libbb.h"
-#ifdef CONFIG_SELINUX
+#if ENABLE_SELINUX
 #include <selinux/selinux.h>  /* for setexeccon  */
 #endif
 
-#ifdef CONFIG_SELINUX
-static security_context_t current_sid=NULL;
+#if ENABLE_SELINUX
+static security_context_t current_sid;
 
 void
 renew_current_security_context(void)
 {
-  if  (current_sid)
-    freecon(current_sid);  /* Release old context  */
-
-  getcon(&current_sid);  /* update */
-
-  return;
+    if (current_sid)
+        freecon(current_sid);  /* Release old context  */
+    getcon(&current_sid);  /* update */
 }
 void
 set_current_security_context(security_context_t sid)
 {
-  if  (current_sid)
-    freecon(current_sid);  /* Release old context  */
-
-  current_sid=sid;
-
-  return;
+    if (current_sid)
+        freecon(current_sid);  /* Release old context  */
+    current_sid = sid;
 }
 
@@ -72 +59 @@
    arguments.  */
 
-void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args)
+void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
 {
     const char **args;
@@ -78 +65 @@
     int additional_args_cnt = 0;
 
-    for ( args = additional_args; args && *args; args++ )
+    for (args = additional_args; args && *args; args++)
         additional_args_cnt++;
 
-        args = (const char **) xmalloc (sizeof (char *) * ( 4  + additional_args_cnt ));
+    args = xmalloc(sizeof(char*) * (4 + additional_args_cnt));
 
-    args [0] = bb_get_last_path_component ( bb_xstrdup ( shell ));
+    args[0] = bb_get_last_path_component(xstrdup(shell));
 
-    if ( loginshell )
-        args [0] = bb_xasprintf ("-%s", args [0]);
+    if (loginshell)
+        args[0] = xasprintf("-%s", args[0]);
 
-    if ( command ) {
-        args [argno++] = "-c";
-        args [argno++] = command;
+    if (command) {
+        args[argno++] = "-c";
+        args[argno++] = command;
     }
-    if ( additional_args ) {
-        for ( ; *additional_args; ++additional_args )
-            args [argno++] = *additional_args;
+    if (additional_args) {
+        for (; *additional_args; ++additional_args)
+            args[argno++] = *additional_args;
     }
-    args [argno] = 0;
-#ifdef CONFIG_SELINUX
-    if ( (current_sid) && (!setexeccon(current_sid)) ) {
-        freecon(current_sid);
-        execve(shell, (char **) args, environ);
+    args[argno] = NULL;
+#if ENABLE_SELINUX
+    if (current_sid && !setexeccon(current_sid)) {
+        freecon(current_sid);
+        execve(shell, (char **) args, environ);
     } else
 #endif
-      execv ( shell, (char **) args );
-    bb_perror_msg_and_die ( "cannot run %s", shell );
+    execv(shell, (char **) args);
+    bb_perror_msg_and_die("cannot run %s", shell);
 }