Making note of my changes

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index 9e4e11473437f081f43f622356d378e69e46113c..ec03afd9589a84ae56ac1367c142518d83cfe728 100644 (file)
--- a/du.c
+++ b/du.c
@@ -3,7 +3,7 @@
  *
  *
  * Copyright (C) 1999 by Lineo, inc.
- * Written by John Beppu <beppu@line.com>
+ * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,28 +26,51 @@
 #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\n"
+"\t-s\tdisplay only a total for each argument\n"
+;
+
+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
-size(char *filename)
+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)) {
@@ -65,19 +88,56 @@ size(char *filename)
            { continue; }
 
            sprintf(newfile, "%s/%s", filename, name);
-           sum += size(newfile);
+           sum += du(newfile);
        }
        closedir(dir);
        print(sum, filename);
     }
+    du_depth--;
     return sum;
 }
 
 int 
 du_main(int argc, char **argv)
 {
-    /* I'll fill main() in shortly */
-    size(".");
+    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 {
+       int sum;
+       for ( ; i < argc; i++) {
+           sum = du(argv[i]);
+           if ((sum) && (isDirectory(argv[i]))) { print_normal(sum, argv[i]); }
+       }
+    }
+
     exit(0);
 }
 
+/* $Id: du.c,v 1.8 1999/12/17 18:44:15 erik Exp $ */