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

diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index a648137e1..05f7f968f 100644
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -2,146 +2,54 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * 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
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-#define READ_BUF_SIZE	50
-
-
-/* For Erik's nifty devps device driver */
-#ifdef CONFIG_FEATURE_USE_DEVPS_PATCH
-#include <linux/devps.h> 
-
 /* find_pid_by_name()
- *  
- *  This finds the pid of the specified process,
- *  by using the /dev/ps device driver.
  *
- *  Returns a list of all matching PIDs
- */
-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;
-	long* pidList=NULL;
-
-	/* open device */ 
-	fd = open(device, O_RDONLY);
-	if (fd < 0)
-		perror_msg_and_die("open failed for `%s'", device);
-
-	/* Find out how many processes there are */
-	if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
-		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
-	
-	/* Allocate some memory -- grab a few extras just in case 
-	 * some new processes start up while we wait. The kernel will
-	 * just ignore any extras if we give it too many, and will trunc.
-	 * the list if we give it too few.  */
-	pid_array = (pid_t*) xcalloc( num_pids+10, sizeof(pid_t));
-	pid_array[0] = num_pids+10;
-
-	/* Now grab the pid list */
-	if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) 
-		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
-
-	/* Now search for a match */
-	for (i=1, j=0; i<pid_array[0] ; i++) {
-		char* p;
-		struct pid_info info;
-
-	    info.pid = pid_array[i];
-	    if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-			perror_msg_and_die("\nDEVPS_GET_PID_INFO");
-
-		/* Make sure we only match on the process name */
-		p=info.command_line+1;
-		while ((*p != 0) && !isspace(*(p)) && (*(p-1) != '\\')) { 
-			(p)++;
-		}
-		if (isspace(*(p)))
-				*p='\0';
-
-		if ((strstr(info.command_line, pidName) != NULL)
-				&& (strlen(pidName) == strlen(info.command_line))) {
-			pidList=xrealloc( pidList, sizeof(long) * (j+2));
-			pidList[j++]=info.pid;
-		}
-	}
-	if (pidList) {
-		pidList[j]=0;
-	} else {
-		pidList=xrealloc( pidList, sizeof(long));
-		pidList[0]=-1;
-	}
-
-	/* Free memory */
-	free( pid_array);
-
-	/* close device */
-	if (close (fd) != 0) 
-		perror_msg_and_die("close failed for `%s'", device);
-
-	return pidList;
-}
-
-#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 
+ *  Currently, it's implemented by rummaging through
  *  the proc filesystem.
  *
  *  Returns a list of all matching PIDs
+ *  It is the caller's duty to free the returned pidlist.
  */
-extern long* find_pid_by_name( const char* pidName)
+pid_t* find_pid_by_name(const char* procName)
 {
-	long* pidList;
-	int i=0;
-	procps_status_t * p;
+	pid_t* pidList;
+	int i = 0;
+	procps_status_t* p;
 
-	pidList = xmalloc(sizeof(long));
+	pidList = xmalloc(sizeof(*pidList));
 	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 (strncmp(p->short_cmd, procName, COMM_LEN-1) == 0) {
+			pidList = xrealloc(pidList, sizeof(*pidList) * (i+2));
+			pidList[i++] = p->pid;
 		}
 	}
 
-	pidList[i] = i==0 ? -1 : 0;
+	pidList[i] = 0;
 	return pidList;
 }
-#endif							/* CONFIG_FEATURE_USE_DEVPS_PATCH */
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+pid_t *pidlist_reverse(pid_t *pidList)
+{
+	int i = 0;
+	while (pidList[i])
+		i++;
+	if (--i >= 0) {
+		pid_t k;
+		int j;
+		for (j = 0; i > j; i--, j++) {
+			k = pidList[i];
+			pidList[i] = pidList[j];
+			pidList[j] = k;
+		}
+	}
+	return pidList;
+}