Apply vodz' last_patch52

[oweals/busybox.git] / libbb / find_pid_by_name.c

diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index f335e9c1f36cfc55d101ac874395bc8c88895ecd..4eaee03e32a72cc1e4ae8f6aa5c47a3c4dcb191b 100644 (file)
--- 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,10 +17,6 @@
  * 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>
@@ -36,7 +30,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 +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);
@@ -93,12 +87,16 @@ 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)
+       if (pidList) {
                pidList[j]=0;
+       } else {
+               pidList=xrealloc( pidList, sizeof(long));
+               pidList[0]=-1;
+       }
 
        /* Free memory */
        free( pid_array);
@@ -110,7 +108,7 @@ 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()
  *  
@@ -120,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");
@@ -158,21 +156,20 @@ 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 we found nothing, guess PID 1 and call it good */
-               pidList=xrealloc( pidList, sizeof(pid_t));
-               pidList[0]=1;
+       } 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 */
 /*