aboutsummaryrefslogtreecommitdiff
path: root/libbb/run_parts.c
diff options
context:
space:
mode:
Diffstat (limited to 'libbb/run_parts.c')
-rw-r--r--libbb/run_parts.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libbb/run_parts.c b/libbb/run_parts.c
index 7829a84ba..58645660b 100644
--- a/libbb/run_parts.c
+++ b/libbb/run_parts.c
@@ -69,7 +69,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
69 if (test_mode & 2) { 69 if (test_mode & 2) {
70 return(2); 70 return(2);
71 } 71 }
72 perror_msg_and_die("failed to open directory %s", arg0); 72 bb_perror_msg_and_die("failed to open directory %s", arg0);
73 } 73 }
74 74
75 for (i = 0; i < entries; i++) { 75 for (i = 0; i < entries; i++) {
@@ -77,7 +77,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
77 filename = concat_path_file(arg0, namelist[i]->d_name); 77 filename = concat_path_file(arg0, namelist[i]->d_name);
78 78
79 if (stat(filename, &st) < 0) { 79 if (stat(filename, &st) < 0) {
80 perror_msg_and_die("failed to stat component %s", filename); 80 bb_perror_msg_and_die("failed to stat component %s", filename);
81 } 81 }
82 if (S_ISREG(st.st_mode) && !access(filename, X_OK)) { 82 if (S_ISREG(st.st_mode) && !access(filename, X_OK)) {
83 if (test_mode & 1) { 83 if (test_mode & 1) {
@@ -89,7 +89,7 @@ extern int run_parts(char **args, const unsigned char test_mode)
89 int pid; 89 int pid;
90 90
91 if ((pid = vfork()) < 0) { 91 if ((pid = vfork()) < 0) {
92 perror_msg_and_die("failed to fork"); 92 bb_perror_msg_and_die("failed to fork");
93 } else if (!pid) { 93 } else if (!pid) {
94 args[0] = filename; 94 args[0] = filename;
95 execv(filename, args); 95 execv(filename, args);
@@ -100,19 +100,19 @@ extern int run_parts(char **args, const unsigned char test_mode)
100 waitpid(pid, &result, 0); 100 waitpid(pid, &result, 0);
101 if(exec_errno) { 101 if(exec_errno) {
102 errno = exec_errno; 102 errno = exec_errno;
103 perror_msg_and_die("failed to exec %s", filename); 103 bb_perror_msg_and_die("failed to exec %s", filename);
104 } 104 }
105 if (WIFEXITED(result) && WEXITSTATUS(result)) { 105 if (WIFEXITED(result) && WEXITSTATUS(result)) {
106 perror_msg("%s exited with return code %d", filename, WEXITSTATUS(result)); 106 bb_perror_msg("%s exited with return code %d", filename, WEXITSTATUS(result));
107 exitstatus = 1; 107 exitstatus = 1;
108 } else if (WIFSIGNALED(result)) { 108 } else if (WIFSIGNALED(result)) {
109 perror_msg("%s exited because of uncaught signal %d", filename, WTERMSIG(result)); 109 bb_perror_msg("%s exited because of uncaught signal %d", filename, WTERMSIG(result));
110 exitstatus = 1; 110 exitstatus = 1;
111 } 111 }
112 } 112 }
113 } 113 }
114 else if (!S_ISDIR(st.st_mode)) { 114 else if (!S_ISDIR(st.st_mode)) {
115 error_msg("component %s is not an executable plain file", filename); 115 bb_error_msg("component %s is not an executable plain file", filename);
116 exitstatus = 1; 116 exitstatus = 1;
117 } 117 }
118 118