INN commit: trunk/contrib (reset-cnfs.c)

[INN Commit]

    Date: Sunday, September 21, 2014 @ 05:22:33
  Author: iulius
Revision: 9703

Fix build of contrib/reset-cnfs.c

Add correct include header files.

Use the right DO_LARGEFILES variable instead of LARGE_FILES.

Reformat the code (remove tabulations).

Properly exit with the right status code.

Modified:
  trunk/contrib/reset-cnfs.c

--------------+
 reset-cnfs.c |   85 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 37 deletions(-)

Modified: reset-cnfs.c
===================================================================
--- reset-cnfs.c	2014-09-21 12:20:43 UTC (rev 9702)
+++ reset-cnfs.c	2014-09-21 12:22:33 UTC (rev 9703)
@@ -1,56 +1,67 @@
 /* Quick and Dirty Hack to reset a CNFS buffer without having to DD the
  * Entire Thing from /dev/zero again. */
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "config.h"
+#include "clibrary.h"
+#include "portable/stdbool.h"
+
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
-#include <stdio.h>
 
-/* uncomment the below for LARGE_FILES support */ 
-/* #define LARGE_FILES */
-
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     int fd;
     int i, j;
     char buf[512];
-#ifdef LARGE_FILES 
-    struct stat64 st; 
-#else 
-    struct stat st; 
+#ifdef DO_LARGEFILES
+    struct stat64 st;
+#else
+    struct stat st;
 #endif
     int numwr;
+    bool status = true;
 
     bzero(buf, sizeof(buf));
     for (i = 1; i < argc; i++) {
-#ifdef LARGE_FILES 
-	if ((fd = open(argv[i], O_LARGEFILE | O_RDWR, 0664)) < 0) 
-#else 
-	if ((fd = open(argv[i], O_RDWR, 0664)) < 0) 
+#ifdef DO_LARGEFILES
+        if ((fd = open(argv[i], O_LARGEFILE | O_RDWR, 0664)) < 0) {
+#else
+        if ((fd = open(argv[i], O_RDWR, 0664)) < 0) {
 #endif
-	    fprintf(stderr, "Could not open file %s: %s\n", argv[i], strerror(errno));
-	else {
-#ifdef LARGE_FILES 
-	    if (fstat64(fd, &st) < 0) { 
-#else 
-	    if (fstat(fd, &st) < 0) { 
+            fprintf(stderr, "Could not open file %s: %s\n", argv[i], strerror(errno));
+            status = false;
+        } else {
+#ifdef DO_LARGEFILES
+            if (fstat64(fd, &st) < 0) {
+#else
+            if (fstat(fd, &st) < 0) {
 #endif
-		fprintf(stderr, "Could not stat file %s: %s\n", argv[i], strerror(errno));
-	    } else {
-		/* each bit in the bitfield is 512 bytes of data.  Each byte
-		 * has 8 bits, so calculate as 512 * 8 bytes of data, plus
-		 * fuzz. buf has 512 bytes in it, therefore containing data for
-		 * (512 * 8) * 512 bytes of data. */
-		numwr = (st.st_size / (512*8) / sizeof(buf)) + 50;
-		printf("File %s: %u %u\n", argv[i], st.st_size, numwr);
-		for (j = 0; j < numwr; j++) {
-		    if (!(j % 100))
-			printf("\t%d/%d\n", j, numwr);
-		    write(fd, buf, sizeof(buf));
-		}
-	    }
-	    close(fd);
-	}
+                fprintf(stderr, "Could not stat file %s: %s\n", argv[i], strerror(errno));
+                status = false;
+            } else {
+                /* Each bit in the bitfield is 512 bytes of data.  Each byte
+                 * has 8 bits, so calculate as 512 * 8 bytes of data, plus
+                 * fuzz.  buf has 512 bytes in it, therefore containing data
+                 * for (512 * 8) * 512 bytes of data. */
+                numwr = (st.st_size / (512*8) / sizeof(buf)) + 50;
+                printf("File %s: %lu %u\n", argv[i], st.st_size, numwr);
+                for (j = 0; j < numwr; j++) {
+                    if (!(j % 100)) {
+                        printf("\t%d/%d\n", j, numwr);
+                    }
+                    write(fd, buf, sizeof(buf));
+                }
+            }
+            close(fd);
+            status = true;
+        }
     }
+
+    if (status) {
+        exit(0);
+    } else {
+        exit(1);
+    }
 }