Add myself

[collectd.git] / src / zone.c

diff --git a/src/zone.c b/src/zone.c
index 52dd977..b8cc919 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
@@ -17,6 +17,7 @@
  *
  * Authors:
  *   Mathijs Mohlmann
+ *   Dagobert Michelsen (forward-porting)
  **/
 
 #define _BSD_SOURCE
@@ -64,11 +65,9 @@ zone_read_procfile(char *pidstr, char *file, void *buf, size_t bufsize)
        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) {
@@ -188,6 +187,9 @@ static int zone_read (void)
 
        tree=zone_scandir(procdir);
        closedir(procdir);
+       if (tree == NULL) {
+               return (-1);
+       }
        zone_submit_values(tree); /* this also frees tree */
        return (0);
 }