Making note of my changes

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index 79bf0ba86303ed19023a2447938716604cf35549..ec03afd9589a84ae56ac1367c142518d83cfe728 100644 (file)
--- a/du.c
+++ b/du.c
@@ -26,22 +26,38 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <errno.h>
 #if 0
 #include <unistd.h>
 #include <sys/stat.h>
 #endif
 
+typedef void (Display)(size_t, char *);
+
 static const char du_usage[] =
-"Usage: du [OPTION]... [FILE]...\n";
+"Usage: du [OPTION]... [FILE]...\n\n"
+"\t-s\tdisplay only a total for each argument\n"
+;
 
-typedef void (Display)(size_t, char *);
+static int     du_depth = 0;
+
+static Display *print;
 
 static void
-print(size_t size, char *filename)
+print_normal(size_t size, char *filename)
 {
     fprintf(stdout, "%-7d %s\n", (size >> 1), filename);
 }
 
+static void
+print_summary(size_t size, char *filename)
+{
+    if (du_depth == 1) { 
+       print_normal(size, filename); 
+    }
+}
+
+
 /* tiny recursive du */
 static size_t
 du(char *filename)
@@ -49,7 +65,12 @@ du(char *filename)
     struct stat statbuf;
     size_t     sum;
 
-    if ((lstat(filename, &statbuf)) != 0) { return 0; }
+    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)) {
@@ -72,6 +93,7 @@ du(char *filename)
        closedir(dir);
        print(sum, filename);
     }
+    du_depth--;
     return sum;
 }
 
@@ -81,12 +103,16 @@ 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);
@@ -104,12 +130,14 @@ du_main(int argc, char **argv)
     if (i >= argc) {
        du(".");
     } else {
+       int sum;
        for ( ; i < argc; i++) {
-           printf("%-7d %s\n", du(argv[i]) >> 1, argv[i]);
+           sum = du(argv[i]);
+           if ((sum) && (isDirectory(argv[i]))) { print_normal(sum, argv[i]); }
        }
     }
 
     exit(0);
 }
 
-/* $Id: du.c,v 1.3 1999/12/10 06:45:42 andersen Exp $ */
+/* $Id: du.c,v 1.8 1999/12/17 18:44:15 erik Exp $ */