Patch from Pierre PEIFFER <pierre.peiffer@sxb.bsf.alcatel.fr>

that copes with the fact that processes may have been swapped
out.
This commit is contained in:
Eric Andersen 2001-03-17 00:05:42 +00:00
parent e2a3cd15a8
commit 8a6dbf6709

View File

@ -32,6 +32,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "libbb.h" #include "libbb.h"
#define READ_BUF_SIZE 50
/* For Erik's nifty devps device driver */ /* For Erik's nifty devps device driver */
#ifdef BB_FEATURE_USE_DEVPS_PATCH #ifdef BB_FEATURE_USE_DEVPS_PATCH
@ -131,22 +133,27 @@ extern pid_t* find_pid_by_name( char* pidName)
while ((next = readdir(dir)) != NULL) { while ((next = readdir(dir)) != NULL) {
FILE *status; FILE *status;
char filename[256]; char filename[READ_BUF_SIZE];
char buffer[256]; char buffer[READ_BUF_SIZE];
char name[READ_BUF_SIZE];
/* If it isn't a number, we don't want it */ /* If it isn't a number, we don't want it */
if (!isdigit(*next->d_name)) if (!isdigit(*next->d_name))
continue; continue;
sprintf(filename, "/proc/%s/cmdline", next->d_name); sprintf(filename, "/proc/%s/status", next->d_name);
status = fopen(filename, "r"); if (! (status = fopen(filename, "r")) ) {
if (!status) { continue;
}
if (fgets(buffer, READ_BUF_SIZE-1, status) == NULL) {
fclose(status);
continue; continue;
} }
fgets(buffer, 256, status);
fclose(status); fclose(status);
if (strstr(get_last_path_component(buffer), pidName) != NULL) { /* 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(pid_t) * (i+2));
pidList[i++]=strtol(next->d_name, NULL, 0); pidList[i++]=strtol(next->d_name, NULL, 0);
} }