applets: fix compile-time warning

[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 930710f325ba237102722f27016bd5f1d084c267..e98616940c061ce28b9a62d74203ae7ac13fd590 100644 (file)
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -4,31 +4,11 @@
  *
  * 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 COMM_LEN 16 /* synchronize with size of comm in struct task_struct
-                                          in /usr/include/linux/sched.h */
-
-
 /* find_pid_by_name()
  *
  *  Modified by Vladimir Oleynik for use with libbb/procps.c
@@ -37,34 +17,39 @@
  *  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 = NULL;
 
-       pidList = xmalloc(sizeof(long));
-#ifdef CONFIG_SELINUX
-       while ((p = procps_scan(0, 0, NULL)) != 0) {
-#else
-       while ((p = procps_scan(0)) != 0) {
-#endif
-               if (strncmp(p->short_cmd, pidName, COMM_LEN-1) == 0) {
-                       pidList=xrealloc( pidList, sizeof(long) * (i+2));
-                       pidList[i++]=p->pid;
+       pidList = xmalloc(sizeof(*pidList));
+       while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_COMM))) {
+               if (strncmp(p->comm, procName, sizeof(p->comm)-1) == 0) {
+                       pidList = xrealloc(pidList, sizeof(*pidList) * (i+2));
+                       pidList[i++] = p->pid;
                }
        }
 
-       pidList[i] = i==0 ? -1 : 0;
+       pidList[i] = 0;
        return pidList;
 }
 
-/* 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;
+}