summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libbb.h2
-rw-r--r--init/halt.c2
-rw-r--r--init/poweroff.c2
-rw-r--r--init/reboot.c2
-rw-r--r--libbb/find_pid_by_name.c30
-rw-r--r--procps/kill.c2
-rw-r--r--procps/pidof.c2
7 files changed, 15 insertions, 27 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2dcfa1f..a953b3c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -116,7 +116,7 @@ extern void write_mtab(char* blockDevice, char* directory,
char* filesystemType, long flags, char* string_flags);
extern void erase_mtab(const char * name);
extern long atoi_w_units (const char *cp);
-extern pid_t* find_pid_by_name( char* pidName);
+extern long* find_pid_by_name( char* pidName);
extern char *find_real_root_device_name(const char* name);
extern char *get_line_from_file(FILE *file);
extern void print_file(FILE *file);
diff --git a/init/halt.c b/init/halt.c
index 307c102..917de8b 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -28,7 +28,7 @@ extern int halt_main(int argc, char **argv)
{
#ifdef CONFIG_FEATURE_INITRD
/* don't assume init's pid == 1 */
- pid_t *pid = find_pid_by_name("init");
+ long *pid = find_pid_by_name("init");
if (!pid || *pid<=0) {
pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0)
diff --git a/init/poweroff.c b/init/poweroff.c
index cec2d6d..d99b556 100644
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -28,7 +28,7 @@ extern int poweroff_main(int argc, char **argv)
{
#ifdef CONFIG_FEATURE_INITRD
/* don't assume init's pid == 1 */
- pid_t *pid = find_pid_by_name("init");
+ long *pid = find_pid_by_name("init");
if (!pid || *pid<=0) {
pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0)
diff --git a/init/reboot.c b/init/reboot.c
index a13d424..6f71536 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -28,7 +28,7 @@ extern int reboot_main(int argc, char **argv)
{
#ifdef CONFIG_FEATURE_INITRD
/* don't assume init's pid == 1 */
- pid_t *pid = find_pid_by_name("init");
+ long *pid = find_pid_by_name("init");
if (!pid || *pid<=0) {
pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0)
diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index f183cc0..4eaee03 100644
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -40,13 +40,13 @@
*
* Returns a list of all matching PIDs
*/
-extern pid_t* find_pid_by_name( char* pidName)
+extern long* find_pid_by_name( char* pidName)
{
int fd, i, j;
char device[] = "/dev/ps";
pid_t num_pids;
pid_t* pid_array = NULL;
- pid_t* pidList=NULL;
+ long* pidList=NULL;
/* open device */
fd = open(device, O_RDONLY);
@@ -87,20 +87,14 @@ extern pid_t* find_pid_by_name( char* pidName)
if ((strstr(info.command_line, pidName) != NULL)
&& (strlen(pidName) == strlen(info.command_line))) {
- pidList=xrealloc( pidList, sizeof(pid_t) * (j+2));
+ pidList=xrealloc( pidList, sizeof(long) * (j+2));
pidList[j++]=info.pid;
}
}
if (pidList) {
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=xrealloc( pidList, sizeof(pid_t));
+ pidList=xrealloc( pidList, sizeof(long));
pidList[0]=-1;
}
@@ -124,11 +118,11 @@ extern pid_t* find_pid_by_name( char* pidName)
*
* Returns a list of all matching PIDs
*/
-extern pid_t* find_pid_by_name( char* pidName)
+extern long* find_pid_by_name( char* pidName)
{
DIR *dir;
struct dirent *next;
- pid_t* pidList=NULL;
+ long* pidList=NULL;
int i=0;
dir = opendir("/proc");
@@ -162,21 +156,15 @@ extern pid_t* find_pid_by_name( char* pidName)
/* Buffer should contain a string like "Name: binary_name" */
sscanf(buffer, "%*s %s", name);
if (strcmp(name, pidName) == 0) {
- pidList=xrealloc( pidList, sizeof(pid_t) * (i+2));
+ pidList=xrealloc( pidList, sizeof(long) * (i+2));
pidList[i++]=strtol(next->d_name, NULL, 0);
}
}
- if (pidList)
+ if (pidList) {
pidList[i]=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=xrealloc( pidList, sizeof(pid_t));
+ pidList=xrealloc( pidList, sizeof(long));
pidList[0]=-1;
}
return pidList;
diff --git a/procps/kill.c b/procps/kill.c
index 8b8a992..7147b57 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -114,7 +114,7 @@ extern int kill_main(int argc, char **argv)
pid_t myPid=getpid();
/* Looks like they want to do a killall. Do that */
while (--argc >= 0) {
- pid_t* pidList;
+ long* pidList;
pidList = find_pid_by_name( *argv);
if (!pidList || *pidList<=0) {
diff --git a/procps/pidof.c b/procps/pidof.c
index 5a40288..9415827 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -58,7 +58,7 @@ extern int pidof_main(int argc, char **argv)
/* Looks like everything is set to go. */
while(optind < argc) {
- pid_t* pidList;
+ long* pidList;
pidList = find_pid_by_name( argv[optind]);
if (!pidList || *pidList<=0) {