Some formatting updates (ran the code through indent)

 -Erik

1 files changed, 94 insertions, 91 deletions

diff --git a/coreutils/du.c b/coreutils/du.c
index e2cf3f7c0..7151e3a9c 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini du implementation for busybox
  *
@@ -31,119 +32,121 @@
 #include <dirent.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/param.h>		/* for PATH_MAX */
+#include <sys/param.h>			/* for PATH_MAX */
 
-typedef void (Display)(long, char *);
+typedef void (Display) (long, char *);
 
 static const char du_usage[] =
-"du [OPTION]... [FILE]...\n\n"
-"\t-s\tdisplay only a total for each argument\n"
-;
 
-static int	du_depth = 0;
+	"du [OPTION]... [FILE]...\n\n"
+	"\t-s\tdisplay only a total for each argument\n";
 
-static Display	*print;
+static int du_depth = 0;
 
-static void
-print_normal(long size, char *filename)
+static Display *print;
+
+static void print_normal(long size, char *filename)
 {
-    fprintf(stdout, "%-7ld %s\n", size, filename);
+	fprintf(stdout, "%-7ld %s\n", size, filename);
 }
 
-static void
-print_summary(long size, char *filename)
+static void print_summary(long size, char *filename)
 {
-    if (du_depth == 1) { 
-	print_normal(size, filename); 
-    }
+	if (du_depth == 1) {
+		print_normal(size, filename);
+	}
 }
 
 
 /* tiny recursive du */
-static long
-du(char *filename)
+static long du(char *filename)
 {
-    struct stat statbuf;
-    long	sum;
-
-    if ((lstat(filename, &statbuf)) != 0) { 
-	fprintf(stdout, "du: %s: %s\n", filename, strerror(errno));
-	return 0; 
-    }
-
-    du_depth++;
-    sum = statbuf.st_blocks;
-
-    if (S_ISDIR(statbuf.st_mode)) {
-	DIR		*dir;
-	struct dirent	*entry;
-
-	dir = opendir(filename);
-	if (!dir) { return 0; }
-	while ((entry = readdir(dir))) {
-	    char newfile[PATH_MAX + 1];
-	    char *name = entry->d_name;
-
-	    if (  (strcmp(name, "..") == 0)
-	       || (strcmp(name, ".")  == 0)) 
-	    { continue; }
-
-	    if (strlen(filename) + strlen(name) + 1 > PATH_MAX) {
-	      fprintf(stderr, name_too_long, "du");
-	      return 0;
-	    }
-	    sprintf(newfile, "%s/%s", filename, name);
-
-	    sum += du(newfile);
+	struct stat statbuf;
+	long sum;
+
+	if ((lstat(filename, &statbuf)) != 0) {
+		fprintf(stdout, "du: %s: %s\n", filename, strerror(errno));
+		return 0;
 	}
-	closedir(dir);
-	print(sum, filename);
-    }
-    du_depth--;
-    return sum;
+
+	du_depth++;
+	sum = statbuf.st_blocks;
+
+	if (S_ISDIR(statbuf.st_mode)) {
+		DIR *dir;
+		struct dirent *entry;
+
+		dir = opendir(filename);
+		if (!dir) {
+			return 0;
+		}
+		while ((entry = readdir(dir))) {
+			char newfile[PATH_MAX + 1];
+			char *name = entry->d_name;
+
+			if ((strcmp(name, "..") == 0)
+				|| (strcmp(name, ".") == 0)) {
+				continue;
+			}
+
+			if (strlen(filename) + strlen(name) + 1 > PATH_MAX) {
+				fprintf(stderr, name_too_long, "du");
+				return 0;
+			}
+			sprintf(newfile, "%s/%s", filename, name);
+
+			sum += du(newfile);
+		}
+		closedir(dir);
+		print(sum, filename);
+	}
+	du_depth--;
+	return sum;
 }
 
-int 
-du_main(int argc, char **argv)
+int du_main(int argc, char **argv)
 {
-    int i;
-    char opt;
-
-    /* default behaviour */
-    print = print_normal;
-
-    /* parse argv[] */
-    for (i = 1; i < argc; i++) {
-	if (argv[i][0] == '-') {
-	    opt = argv[i][1];
-	    switch (opt) {
-		case 's':
-		    print = print_summary;
-		    break;
-		case 'h':
-		    usage(du_usage);
-		    break;
-		default:
-		    fprintf(stderr, "du: invalid option -- %c\n", opt);
-		    usage(du_usage);
-	    }
-	} else {
-	    break;
+	int i;
+	char opt;
+
+	/* default behaviour */
+	print = print_normal;
+
+	/* parse argv[] */
+	for (i = 1; i < argc; i++) {
+		if (argv[i][0] == '-') {
+			opt = argv[i][1];
+			switch (opt) {
+			case 's':
+				print = print_summary;
+				break;
+			case 'h':
+				usage(du_usage);
+				break;
+			default:
+				fprintf(stderr, "du: invalid option -- %c\n", opt);
+				usage(du_usage);
+			}
+		} else {
+			break;
+		}
 	}
-    }
 
-    /* go through remaining args (if any) */
-    if (i >= argc) {
-	du(".");
-    } else {
-	long sum;
-	for ( ; i < argc; i++) {
-	    sum = du(argv[i]);
-	    if ((sum) && (isDirectory(argv[i], FALSE))) { print_normal(sum, argv[i]); }
+	/* go through remaining args (if any) */
+	if (i >= argc) {
+		du(".");
+	} else {
+		long sum;
+
+		for (; i < argc; i++) {
+			sum = du(argv[i]);
+			if ((sum) && (isDirectory(argv[i], FALSE))) {
+				print_normal(sum, argv[i]);
+			}
+		}
 	}
-    }
 
-    exit(0);
+	exit(0);
 }
 
-/* $Id: du.c,v 1.10 2000/02/07 05:29:42 erik Exp $ */
+/* $Id: du.c,v 1.11 2000/02/08 19:58:47 erik Exp $ */