Mercurial > hg > toybox
changeset 604:90d6026c36c3
Minor code refactoring.
author | Rob Landley <rob@landley.net> |
---|---|
date | Fri, 22 Jun 2012 22:14:13 -0500 |
parents | 150a6d81bd02 |
children | cd4475a2efde |
files | lib/lib.c |
diffstat | 1 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/lib.c Mon Jun 18 23:23:24 2012 -0500 +++ b/lib/lib.c Fri Jun 22 22:14:13 2012 -0500 @@ -857,29 +857,27 @@ { DIR *dp; struct dirent *entry; - char cmd[PATH_MAX], path[64]; + char cmd[sizeof(toybuf)], path[64]; char **curname; if (!(dp = opendir("/proc"))) perror_exit("opendir"); while ((entry = readdir(dp))) { - int fd; + int fd, n; if (!isdigit(*entry->d_name)) continue; if (sizeof(path) <= snprintf(path, sizeof(path), "/proc/%s/cmdline", entry->d_name)) continue; - if (-1 != (fd=xopen(path, O_RDONLY))) { - int n = read(fd, cmd, sizeof(cmd)); + if (-1 == (fd=open(path, O_RDONLY))) continue; + n = read(fd, cmd, sizeof(cmd)); + close(fd); + if (n<1) continue; - close(fd); - if (n<1) continue; - - for (curname = names; *curname; curname++) - if (!strcmp(basename(cmd), *curname)) - callback(atol(entry->d_name)); - } + for (curname = names; *curname; curname++) + if (!strcmp(basename(cmd), *curname)) + callback(atol(entry->d_name)); } closedir(dp);