/*
* Utility routines.
*
- * Copyright (C) tons of folks. Tracking down who wrote what
- * isn't something I'm going to worry about... If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
- *
*/
#include <stdio.h>
/* For Erik's nifty devps device driver */
-#ifdef BB_FEATURE_USE_DEVPS_PATCH
+#ifdef CONFIG_FEATURE_USE_DEVPS_PATCH
#include <linux/devps.h>
/* find_pid_by_name()
*
* 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);
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)
+ if (pidList) {
pidList[j]=0;
+ } else {
+ pidList=xrealloc( pidList, sizeof(long));
+ pidList[0]=-1;
+ }
/* Free memory */
free( pid_array);
return pidList;
}
-#else /* BB_FEATURE_USE_DEVPS_PATCH */
+#else /* CONFIG_FEATURE_USE_DEVPS_PATCH */
/* find_pid_by_name()
*
*
* 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");
char buffer[READ_BUF_SIZE];
char name[READ_BUF_SIZE];
+ /* Must skip ".." since that is outside /proc */
+ if (strcmp(next->d_name, "..") == 0)
+ continue;
+
/* If it isn't a number, we don't want it */
if (!isdigit(*next->d_name))
continue;
/* 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 {
+ pidList=xrealloc( pidList, sizeof(long));
+ pidList[0]=-1;
+ }
return pidList;
}
-#endif /* BB_FEATURE_USE_DEVPS_PATCH */
+#endif /* CONFIG_FEATURE_USE_DEVPS_PATCH */
/* END CODE */
/*