emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a stupid thinko, and fix killall to cope with the updated

Browse Source 
find_pid_by_name() interface
 -Erik
This commit is contained in:
Eric Andersen
2001-07-05 16:27:34 +00:00
parent 332394b577
commit 8e75f6daa6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kill.c
View File

@@ -218,9 +218,9 @@ extern int kill_main(int argc, char **argv)
pid_t* pidList; pid_t* pidList;
pidList = find_pid_by_name( *argv); pidList = find_pid_by_name( *argv);
if (!pidList) { if (!pidList || *pidList<=0) {
all_found = FALSE; all_found = FALSE;
error_msg( "%s: no process killed", *argv); error_msg_and_die( "%s: no process killed", *argv);
} }
for(; pidList && *pidList!=0; pidList++) { for(; pidList && *pidList!=0; pidList++) {

2
libbb/find_pid_by_name.c
View File

@@ -106,6 +106,7 @@ extern pid_t* find_pid_by_name( char* pidName)
pidList=xrealloc( pidList, sizeof(pid_t)); pidList=xrealloc( pidList, sizeof(pid_t));
pidList[0]=1; pidList[0]=1;
} else { } else {
pidList=xrealloc( pidList, sizeof(pid_t));
pidList[0]=-1; pidList[0]=-1;
} }
@@ -181,6 +182,7 @@ extern pid_t* find_pid_by_name( char* pidName)
pidList=xrealloc( pidList, sizeof(pid_t)); pidList=xrealloc( pidList, sizeof(pid_t));
pidList[0]=1; pidList[0]=1;
} else { } else {
pidList=xrealloc( pidList, sizeof(pid_t));
pidList[0]=-1; pidList[0]=-1;
} }
return pidList; return pidList;

4
procps/kill.c
View File

@@ -218,9 +218,9 @@ extern int kill_main(int argc, char **argv)
pid_t* pidList; pid_t* pidList;
pidList = find_pid_by_name( *argv); pidList = find_pid_by_name( *argv);
if (!pidList) { if (!pidList || *pidList<=0) {
all_found = FALSE; all_found = FALSE;
error_msg( "%s: no process killed", *argv); error_msg_and_die( "%s: no process killed", *argv);
} }
for(; pidList && *pidList!=0; pidList++) { for(; pidList && *pidList!=0; pidList++) {