Regression testing bugfixes from Larry Doolittle. As an aside,

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index b1ca954366159d6b6738fae05761b8428cd853a5..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
@@ -22,7 +22,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_name_too_long
 #include "messages.c"
@@ -31,20 +31,15 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
 #include <errno.h>
 
-typedef void (Display) (long, char *);
-
-static const char du_usage[] =
-       "du [OPTION]... [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nSummarizes disk space used for each FILE and/or directory.\n"
-       "Disk space is printed in units of 1024 bytes.\n\n"
-       "Options:\n"
-       "\t-l\tcount sizes many times if hard linked\n"
-       "\t-s\tdisplay only a total for each argument\n"
+#ifdef BB_FEATURE_HUMAN_READABLE
+unsigned long du_disp_hr = KILOBYTE;
 #endif
-       ;
+
+typedef void (Display) (long, char *);
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
@@ -53,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);
        }
 }
@@ -71,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++;
@@ -108,7 +107,7 @@ static long du(char *filename)
                        }
 
                        if (len + strlen(name) + 1 > BUFSIZ) {
-                               errorMsg(name_too_long);
+                               error_msg(name_too_long);
                                du_depth--;
                                return 0;
                        }
@@ -136,55 +135,59 @@ static long du(char *filename)
 
 int du_main(int argc, char **argv)
 {
+       int status = EXIT_SUCCESS;
        int i;
-       char opt;
+       int c;
 
        /* default behaviour */
        print = print_normal;
 
        /* parse argv[] */
-       for (i = 1; i < argc; i++) {
-               if (argv[i][0] == '-') {
-                       opt = argv[i][1];
-                       switch (opt) {
+       while ((c = getopt(argc, argv, "sl"
+#ifdef BB_FEATURE_HUMAN_READABLE
+"hm"
+#endif
+"k")) != EOF) {
+                       switch (c) {
                        case 's':
-                               print = print_summary;
-                               break;
+                                       print = print_summary;
+                                       break;
                        case 'l':
-                               count_hardlinks = 1;
-                               break;
-                       case 'h':
-                       case '-':
-                               usage(du_usage);
-                               break;
+                                       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:
-                               errorMsg("invalid option -- %c\n", opt);
-                               usage(du_usage);
+                                       show_usage();
                        }
-               } else {
-                       break;
-               }
        }
 
        /* go through remaining args (if any) */
-       if (i >= argc) {
-               du(".");
+       if (optind >= argc) {
+               if (du(".") == 0)
+                       status = EXIT_FAILURE;
        } else {
                long sum;
 
-               for (; i < argc; i++) {
-                       sum = du(argv[i]);
-                       if (sum && isDirectory(argv[i], FALSE, NULL)) {
+               for (i=optind; i < argc; i++) {
+                       if ((sum = du(argv[i])) == 0)
+                               status = EXIT_FAILURE;
+                       if(is_directory(argv[i], FALSE, NULL)==FALSE) {
                                print_normal(sum, argv[i]);
                        }
                        reset_ino_dev_hashtable();
                }
        }
 
-       return(0);
+       return status;
 }
 
-/* $Id: du.c,v 1.21 2000/07/14 01:51:25 kraai Exp $ */
+/* $Id: du.c,v 1.37 2001/02/14 21:23:05 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"