X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fzone.c;h=cb3869d69829ff04e8f908711faecf435a26602e;hb=cce136946b879557f91183e4de58e92b81e138c8;hp=e4aad81513bb2b9858139d3990e31de924f6b73f;hpb=1d2d244077bd02f5ab7b53aef27f8d6e343f8a4a;p=collectd.git

diff --git a/src/zone.c b/src/zone.c
index e4aad815..cb3869d6 100644
--- 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) {
@@ -156,7 +155,8 @@ zone_scandir(DIR *procdir)
 		return(NULL);
 	}
 
-	for (rewinddir(procdir); (direntp = readdir(procdir)); ) {
+	rewinddir(procdir);
+	while ((direntp = readdir(procdir))) {
 		pidstr = direntp->d_name;
 		if (pidstr[0] == '.')	/* skip "." and ".."  */
 			continue;