zone plugin: Undefine _FILE_OFFSET_BITS when building on 32bit hosts.

[collectd.git] / src / zone.c

diff --git a/src/zone.c b/src/zone.c
index 385e511..188fbe3 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
@@ -17,9 +17,18 @@
  *
  * Authors:
  *   Mathijs Mohlmann
+ *   Dagobert Michelsen (forward-porting)
  **/
 
-#define _BSD_SOURCE
+#if HAVE_CONFIG_H
+# include "config.h"
+# undef HAVE_CONFIG_H
+#endif
+/* avoid procfs.h error "Cannot use procfs in the large file compilation environment" */
+#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
+#  undef _FILE_OFFSET_BITS
+#  undef _LARGEFILE64_SOURCE
+#endif
 
 #include "collectd.h"
 #include "common.h"
@@ -65,10 +74,8 @@ zone_read_procfile(char *pidstr, char *file, void *buf, size_t bufsize)
 
        char procfile[MAX_PROCFS_PATH];
        (void)snprintf(procfile, sizeof(procfile), "/proc/%s/%s", pidstr, file);
-       while ((fd = open(procfile, O_RDONLY)) == -1) {
-               if ((errno != EMFILE) || (errno != ENFILE)) {
-                       return(1);
-               }
+       if ((fd = open(procfile, O_RDONLY)) == -1) {
+               return (1);
        }
 
        if (pread(fd, buf, bufsize, 0) != bufsize) {
@@ -156,7 +163,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;