*
* Authors:
* Mathijs Mohlmann
+ * Dagobert Michelsen (forward-porting)
**/
#define _BSD_SOURCE
int fd;
char procfile[MAX_PROCFS_PATH];
- (void)snprintf(procfile, MAX_PROCFS_PATH, "/proc/%s/%s", pidstr, file);
- while ((fd = open(procfile, O_RDONLY)) == -1) {
- if ((errno != EMFILE) || (errno != ENFILE)) {
- return(1);
- }
+ (void)snprintf(procfile, sizeof(procfile), "/proc/%s/%s", pidstr, file);
+ if ((fd = open(procfile, O_RDONLY)) == -1) {
+ return (1);
}
if (pread(fd, buf, bufsize, 0) != bufsize) {
return(NULL);
}
- for (rewinddir(procdir); (direntp = readdir(procdir)); ) {
+ rewinddir(procdir);
+ while ((direntp = readdir(procdir))) {
pidstr = direntp->d_name;
if (pidstr[0] == '.') /* skip "." and ".." */
continue;
if ((procdir = opendir("/proc")) == NULL) {
ERROR("zone plugin: cannot open /proc directory\n");
- exit(1);
+ return (-1);
}
tree=zone_scandir(procdir);
closedir(procdir);
+ if (tree == NULL) {
+ return (-1);
+ }
zone_submit_values(tree); /* this also frees tree */
return (0);
}