Try to make indent formatting less horrible

[oweals/busybox.git] / libbb / run_parts.c

diff --git a/libbb/run_parts.c b/libbb/run_parts.c
index 58645660b0a68650d418a36fe42387626df48659..0eb766086bc77a54154a810c43214d6a5c15837c 100644 (file)
--- a/libbb/run_parts.c
+++ b/libbb/run_parts.c
@@ -47,7 +47,7 @@ static int valid_name(const struct dirent *d)
  * test_mode = 2 means to fail siliently on missing directories
  */
 
-extern int run_parts(char **args, const unsigned char test_mode)
+extern int run_parts(char **args, const unsigned char test_mode, char **env)
 {
        struct dirent **namelist = 0;
        struct stat st;
@@ -80,7 +80,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
                        bb_perror_msg_and_die("failed to stat component %s", filename);
                }
                if (S_ISREG(st.st_mode) && !access(filename, X_OK)) {
-                       if (test_mode & 1) {
+                       if (test_mode) {
                                puts(filename);
                        } else {
                                /* exec_errno is common vfork variable */
@@ -92,7 +92,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
                                        bb_perror_msg_and_die("failed to fork");
                                } else if (!pid) {
                                        args[0] = filename;
-                                       execv(filename, args);
+                                       execve(filename, args, env);
                                        exec_errno = errno;
                                        _exit(1);
                                }
@@ -100,7 +100,8 @@ extern int run_parts(char **args, const unsigned char test_mode)
                                waitpid(pid, &result, 0);
                                if(exec_errno) {
                                        errno = exec_errno;
-                                       bb_perror_msg_and_die("failed to exec %s", filename);
+                                       bb_perror_msg("failed to exec %s", filename);
+                                       exitstatus = 1;
                                }
                                if (WIFEXITED(result) && WEXITSTATUS(result)) {
                                        bb_perror_msg("%s exited with return code %d", filename, WEXITSTATUS(result));