Stop using TRUE and FALSE for exit status.

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index c4fb3a38d5d9d24d42d2254e57d16fda5622675e..a0f1606fe8dc2c5cc497f90143e53da8cb427ea3 100644 (file)
--- a/du.c
+++ b/du.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_name_too_long
 #include "messages.c"
@@ -35,14 +35,6 @@
 
 typedef void (Display) (long, char *);
 
-static const char du_usage[] =
-       "du [OPTION]... [FILE]...\n\n"
-       "Summarize 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";
-
 static int du_depth = 0;
 static int count_hardlinks = 0;
 
@@ -105,7 +97,7 @@ static long du(char *filename)
                        }
 
                        if (len + strlen(name) + 1 > BUFSIZ) {
-                               fprintf(stderr, name_too_long, "du");
+                               errorMsg(name_too_long);
                                du_depth--;
                                return 0;
                        }
@@ -134,42 +126,32 @@ static long du(char *filename)
 int du_main(int argc, char **argv)
 {
        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")) != 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;
                        default:
-                               fprintf(stderr, "du: invalid option -- %c\n", opt);
-                               usage(du_usage);
+                                       usage(du_usage);
                        }
-               } else {
-                       break;
-               }
        }
 
        /* go through remaining args (if any) */
-       if (i >= argc) {
+       if (optind >= argc) {
                du(".");
        } else {
                long sum;
 
-               for (; i < argc; i++) {
+               for (i=optind; i < argc; i++) {
                        sum = du(argv[i]);
                        if (sum && isDirectory(argv[i], FALSE, NULL)) {
                                print_normal(sum, argv[i]);
@@ -178,10 +160,10 @@ int du_main(int argc, char **argv)
                }
        }
 
-       exit(0);
+       return EXIT_SUCCESS;
 }
 
-/* $Id: du.c,v 1.18 2000/04/28 00:18:56 erik Exp $ */
+/* $Id: du.c,v 1.26 2000/12/01 02:55:13 kraai Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"