Merge branch 'master' into newlib
Conflicts: pgrep.c proc/sysinfo.c ps/output.c skill.c top/top.c top/top.h w.c
This commit is contained in:
12
pidof.c
12
pidof.c
@ -106,20 +106,18 @@ static char *pid_link (pid_t pid, const char *base_name)
|
||||
{
|
||||
char link [1000];
|
||||
char *result;
|
||||
int path_alloc_size;
|
||||
int len;
|
||||
ssize_t path_alloc_size;
|
||||
ssize_t len;
|
||||
|
||||
snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name);
|
||||
|
||||
len = path_alloc_size = 0;
|
||||
result = NULL;
|
||||
do {
|
||||
if (len == path_alloc_size) {
|
||||
grow_size (path_alloc_size);
|
||||
result = (char *) xrealloc (result, path_alloc_size);
|
||||
}
|
||||
grow_size(path_alloc_size);
|
||||
result = xrealloc(result, path_alloc_size);
|
||||
|
||||
if ((len = readlink(link, result, path_alloc_size - 1)) < 0) {
|
||||
if ((len = readlink(link, result, path_alloc_size)) < 0) {
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user