diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-07-05 16:27:34 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-07-05 16:27:34 +0000 |
commit | 8e75f6daa6d365b4271c5f9b27b55898835f51cd (patch) | |
tree | e0c9124998c072c304a28dd89652c3768b1a9baa | |
parent | 332394b577d75669cd30c3ea884e9152d63366f8 (diff) | |
download | busybox-w32-8e75f6daa6d365b4271c5f9b27b55898835f51cd.tar.gz busybox-w32-8e75f6daa6d365b4271c5f9b27b55898835f51cd.tar.bz2 busybox-w32-8e75f6daa6d365b4271c5f9b27b55898835f51cd.zip |
Fix a stupid thinko, and fix killall to cope with the updated
find_pid_by_name() interface
-Erik
-rw-r--r-- | kill.c | 4 | ||||
-rw-r--r-- | libbb/find_pid_by_name.c | 2 | ||||
-rw-r--r-- | procps/kill.c | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -218,9 +218,9 @@ extern int kill_main(int argc, char **argv) | |||
218 | pid_t* pidList; | 218 | pid_t* pidList; |
219 | 219 | ||
220 | pidList = find_pid_by_name( *argv); | 220 | pidList = find_pid_by_name( *argv); |
221 | if (!pidList) { | 221 | if (!pidList || *pidList<=0) { |
222 | all_found = FALSE; | 222 | all_found = FALSE; |
223 | error_msg( "%s: no process killed", *argv); | 223 | error_msg_and_die( "%s: no process killed", *argv); |
224 | } | 224 | } |
225 | 225 | ||
226 | for(; pidList && *pidList!=0; pidList++) { | 226 | for(; pidList && *pidList!=0; pidList++) { |
diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c index 57decc69c..7f39dd41c 100644 --- a/libbb/find_pid_by_name.c +++ b/libbb/find_pid_by_name.c | |||
@@ -106,6 +106,7 @@ extern pid_t* find_pid_by_name( char* pidName) | |||
106 | pidList=xrealloc( pidList, sizeof(pid_t)); | 106 | pidList=xrealloc( pidList, sizeof(pid_t)); |
107 | pidList[0]=1; | 107 | pidList[0]=1; |
108 | } else { | 108 | } else { |
109 | pidList=xrealloc( pidList, sizeof(pid_t)); | ||
109 | pidList[0]=-1; | 110 | pidList[0]=-1; |
110 | } | 111 | } |
111 | 112 | ||
@@ -181,6 +182,7 @@ extern pid_t* find_pid_by_name( char* pidName) | |||
181 | pidList=xrealloc( pidList, sizeof(pid_t)); | 182 | pidList=xrealloc( pidList, sizeof(pid_t)); |
182 | pidList[0]=1; | 183 | pidList[0]=1; |
183 | } else { | 184 | } else { |
185 | pidList=xrealloc( pidList, sizeof(pid_t)); | ||
184 | pidList[0]=-1; | 186 | pidList[0]=-1; |
185 | } | 187 | } |
186 | return pidList; | 188 | return pidList; |
diff --git a/procps/kill.c b/procps/kill.c index fb3d72213..8745f63c1 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
@@ -218,9 +218,9 @@ extern int kill_main(int argc, char **argv) | |||
218 | pid_t* pidList; | 218 | pid_t* pidList; |
219 | 219 | ||
220 | pidList = find_pid_by_name( *argv); | 220 | pidList = find_pid_by_name( *argv); |
221 | if (!pidList) { | 221 | if (!pidList || *pidList<=0) { |
222 | all_found = FALSE; | 222 | all_found = FALSE; |
223 | error_msg( "%s: no process killed", *argv); | 223 | error_msg_and_die( "%s: no process killed", *argv); |
224 | } | 224 | } |
225 | 225 | ||
226 | for(; pidList && *pidList!=0; pidList++) { | 226 | for(; pidList && *pidList!=0; pidList++) { |