return 1;
}
-/* test mode = 1 is the same as offical run_parts
- * test_mode = 2 means to fail siliently on missing directories
+/* test mode = 1 is the same as official run_parts
+ * test_mode = 2 means to fail silently 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;
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 */
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);
}
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));
exitstatus = 1;
}
}
- }
+ }
else if (!S_ISDIR(st.st_mode)) {
bb_error_msg("component %s is not an executable plain file", filename);
exitstatus = 1;
free(filename);
}
free(namelist);
-
+
return(exitstatus);
}