Revert multibuild.pl change.

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index fa76465e737dfcd1b073e07b5e05ba38feead725..516f4c92b582477095e40a9c3e17fc046aeffb49 100644 (file)
--- a/du.c
+++ b/du.c
@@ -3,7 +3,7 @@
  * Mini du implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,8 +31,14 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
 #include <errno.h>
 
+#ifdef BB_FEATURE_HUMAN_READABLE
+unsigned long du_disp_hr = KILOBYTE;
+#endif
+
 typedef void (Display) (long, char *);
 
 static int du_depth = 0;
@@ -42,12 +48,17 @@ static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-       fprintf(stdout, "%ld\t%s\n", size, filename);
+#ifdef BB_FEATURE_HUMAN_READABLE
+       printf("%s\t%s\n", format((size * KILOBYTE), du_disp_hr), filename);
+#else
+       printf("%ld\t%s\n", size, filename);
+#endif
 }
 
 static void print_summary(long size, char *filename)
 {
        if (du_depth == 1) {
+printf("summary\n");
                print_normal(size, filename);
        }
 }
@@ -60,8 +71,7 @@ static long du(char *filename)
        int len;
 
        if ((lstat(filename, &statbuf)) != 0) {
-               printf("du: %s: %s\n", filename, strerror(errno));
-               return 0;
+               perror_msg_and_die("%s", filename);
        }
 
        du_depth++;
@@ -133,7 +143,11 @@ int du_main(int argc, char **argv)
        print = print_normal;
 
        /* parse argv[] */
-       while ((c = getopt(argc, argv, "sl")) != EOF) {
+       while ((c = getopt(argc, argv, "sl"
+#ifdef BB_FEATURE_HUMAN_READABLE
+"hm"
+#endif
+"k")) != EOF) {
                        switch (c) {
                        case 's':
                                        print = print_summary;
@@ -141,8 +155,15 @@ int du_main(int argc, char **argv)
                        case 'l':
                                        count_hardlinks = 1;
                                        break;
+#ifdef BB_FEATURE_HUMAN_READABLE
+                       case 'h': du_disp_hr = 0;        break;
+                       case 'm': du_disp_hr = MEGABYTE; break;
+                       case 'k': du_disp_hr = KILOBYTE; break;
+#else
+                       case 'k': break;
+#endif
                        default:
-                                       usage(du_usage);
+                                       show_usage();
                        }
        }
 
@@ -156,7 +177,7 @@ int du_main(int argc, char **argv)
                for (i=optind; i < argc; i++) {
                        if ((sum = du(argv[i])) == 0)
                                status = EXIT_FAILURE;
-                       if (sum && is_directory(argv[i], FALSE, NULL)) {
+                       if(is_directory(argv[i], FALSE, NULL)==FALSE) {
                                print_normal(sum, argv[i]);
                        }
                        reset_ino_dev_hashtable();
@@ -166,7 +187,7 @@ int du_main(int argc, char **argv)
        return status;
 }
 
-/* $Id: du.c,v 1.29 2000/12/07 19:56:48 markw Exp $ */
+/* $Id: du.c,v 1.37 2001/02/14 21:23:05 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"