emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PID should be stored in pid_t, not int or long.

Browse Source 
find_pid_by_name() was returning 0 or -1 in last array element,
but -1 was never checked. We can use just 0 intead.
This commit is contained in:
Denis Vlasenko
2006-11-01 09:16:49 +00:00
parent d3ada32285
commit 35fb512728
8 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libbb/find_pid_by_name.c
View File

@@ -7,10 +7,6 @@
* 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"
/* find_pid_by_name()
@@ -23,30 +19,31 @@
* Returns a list of all matching PIDs
* It is the caller's duty to free the returned pidlist.
*/
long* find_pid_by_name(const char* pidName)
pid_t* find_pid_by_name(const char* procName)
{
long* pidList;
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 (strncmp(p->short_cmd, pidName, COMM_LEN-1) == 0) {
pidList = xrealloc( pidList, sizeof(long) * (i+2));
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;
}
long *pidlist_reverse(long *pidList)
pid_t *pidlist_reverse(pid_t *pidList)
{
int i = 0;
while (pidList[i] > 0 && ++i);
if (i-- > 0) {
long k;
while (pidList[i])
i++;
if (--i >= 0) {
pid_t k;
int j;
for (j = 0; i > j; i--, j++) {
k = pidList[i];