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

Implement suggestion from Adam Slattery, (don't default to killing closing bug #1190.

Browse Source
This commit is contained in:
Eric Andersen 2001-07-05 15:56:36 +00:00
parent 94f3a570e1
commit d50a61956c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libbb/find_pid_by_name.c
View File

@ -97,8 +97,17 @@ extern pid_t* find_pid_by_name( char* pidName)
pidList[j++]=info.pid; pidList[j++]=info.pid;
} }
} }
if (pidList) if (pidList) {
pidList[j]=0; pidList[j]=0;
} else if ( strcmp(pidName, "init")==0) {
/* If we found nothing and they were trying to kill "init",
* guess PID 1 and call it good... Perhaps we should simply
* exit if /proc isn't mounted, but this will do for now. */
pidList=xrealloc( pidList, sizeof(pid_t));
pidList[0]=1;
} else {
pidList[0]=-1;
}
/* Free memory */ /* Free memory */
free( pid_array); free( pid_array);
@ -165,10 +174,14 @@ extern pid_t* find_pid_by_name( char* pidName)
if (pidList) if (pidList)
pidList[i]=0; pidList[i]=0;
else { else if ( strcmp(pidName, "init")==0) {
/* If we found nothing, guess PID 1 and call it good */ /* If we found nothing and they were trying to kill "init",
* guess PID 1 and call it good... Perhaps we should simply
* exit if /proc isn't mounted, but this will do for now. */
pidList=xrealloc( pidList, sizeof(pid_t)); pidList=xrealloc( pidList, sizeof(pid_t));
pidList[0]=1; pidList[0]=1;
} else {
pidList[0]=-1;
} }
return pidList; return pidList;
} }