X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ffind_pid_by_name.c;h=a648137e14e19376493a28a3172fd06e1c39b8cb;hb=44608e9693b03661fbab5e27650bb040c6871d11;hp=7f39dd41c8d66452afa039c6fc0311205f1a2b6d;hpb=8e75f6daa6d365b4271c5f9b27b55898835f51cd;p=oweals%2Fbusybox.git

diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index 7f39dd41c..a648137e1 100644
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -2,9 +2,7 @@
 /*
  * 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
@@ -19,16 +17,11 @@
  * 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>
 #include <ctype.h>
 #include <string.h>
-#include <dirent.h>
 #include <stdlib.h>
 #include "libbb.h"
 
@@ -36,7 +29,7 @@
 
 
 /* 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()
@@ -46,13 +39,13 @@
  *
  *  Returns a list of all matching PIDs
  */
-extern pid_t* find_pid_by_name( char* pidName)
+extern long* find_pid_by_name( const 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);
@@ -93,20 +86,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;
 	}
 
@@ -120,74 +107,35 @@ extern pid_t* find_pid_by_name( char* pidName)
 	return pidList;
 }
 
-#else		/* BB_FEATURE_USE_DEVPS_PATCH */
+#else		/* CONFIG_FEATURE_USE_DEVPS_PATCH */
 
 /* find_pid_by_name()
  *  
+ *  Modified by Vladimir Oleynik for use with libbb/procps.c
  *  This finds the pid of the specified process.
  *  Currently, it's implemented by rummaging through 
  *  the proc filesystem.
  *
  *  Returns a list of all matching PIDs
  */
-extern pid_t* find_pid_by_name( char* pidName)
+extern long* find_pid_by_name( const char* pidName)
 {
-	DIR *dir;
-	struct dirent *next;
-	pid_t* pidList=NULL;
+	long* pidList;
 	int i=0;
+	procps_status_t * p;
 
-	dir = opendir("/proc");
-	if (!dir)
-		perror_msg_and_die("Cannot open /proc");
-	
-	while ((next = readdir(dir)) != NULL) {
-		FILE *status;
-		char filename[READ_BUF_SIZE];
-		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;
-
-		sprintf(filename, "/proc/%s/status", next->d_name);
-		if (! (status = fopen(filename, "r")) ) {
-			continue;
-		}
-		if (fgets(buffer, READ_BUF_SIZE-1, status) == NULL) {
-			fclose(status);
-			continue;
-		}
-		fclose(status);
-
-		/* 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[i++]=strtol(next->d_name, NULL, 0);
+	pidList = xmalloc(sizeof(long));
+	while ((p = procps_scan(0)) != 0) {
+		if (strcmp(p->short_cmd, pidName) == 0) {
+			pidList=xrealloc( pidList, sizeof(long) * (i+2));
+			pidList[i++]=p->pid;
 		}
 	}
 
-	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[0]=-1;
-	}
+	pidList[i] = i==0 ? -1 : 0;
 	return pidList;
 }
-#endif							/* BB_FEATURE_USE_DEVPS_PATCH */
+#endif							/* CONFIG_FEATURE_USE_DEVPS_PATCH */
 
 /* END CODE */
 /*