Fix symlink removal problem noted by Erik Andersen.

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index c4fb3a38d5d9d24d42d2254e57d16fda5622675e..3e4821a390010fa885d1a2937963f43eac2a025d 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,26 +22,22 @@
  *
  */
 
-#include "internal.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
-#include "messages.c"
-
 #include <sys/types.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <string.h>
 #include <errno.h>
+#include "busybox.h"
 
-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";
+#ifdef BB_FEATURE_HUMAN_READABLE
+static unsigned long disp_hr = KILOBYTE;
+#endif
+
+typedef void (Display) (long, char *);
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
@@ -50,7 +46,22 @@ static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-       fprintf(stdout, "%ld\t%s\n", size, filename);
+       unsigned long base;
+#ifdef BB_FEATURE_HUMAN_READABLE
+       switch (disp_hr) {
+               case MEGABYTE:
+                       base = KILOBYTE;
+                       break;
+               case KILOBYTE:
+                       base = 1;
+                       break;
+               default:
+                       base = 0;
+       }
+       printf("%s\t%s\n", make_human_readable_str(size, base), filename);
+#else
+       printf("%ld\t%s\n", size, filename);
+#endif
 }
 
 static void print_summary(long size, char *filename)
@@ -65,10 +76,9 @@ static long du(char *filename)
 {
        struct stat statbuf;
        long sum;
-       int len;
 
        if ((lstat(filename, &statbuf)) != 0) {
-               printf("du: %s: %s\n", filename, strerror(errno));
+               perror_msg("%s", filename);
                return 0;
        }
 
@@ -84,6 +94,7 @@ static long du(char *filename)
        if (S_ISDIR(statbuf.st_mode)) {
                DIR *dir;
                struct dirent *entry;
+               char *newfile;
 
                dir = opendir(filename);
                if (!dir) {
@@ -91,27 +102,20 @@ static long du(char *filename)
                        return 0;
                }
 
-               len = strlen(filename);
-               if (filename[len - 1] == '/')
-                       filename[--len] = '\0';
+               newfile = last_char_is(filename, '/');
+               if (newfile)
+                       *newfile = '\0';
 
                while ((entry = readdir(dir))) {
-                       char newfile[BUFSIZ + 1];
                        char *name = entry->d_name;
 
                        if ((strcmp(name, "..") == 0)
                                || (strcmp(name, ".") == 0)) {
                                continue;
                        }
-
-                       if (len + strlen(name) + 1 > BUFSIZ) {
-                               fprintf(stderr, name_too_long, "du");
-                               du_depth--;
-                               return 0;
-                       }
-                       sprintf(newfile, "%s/%s", filename, name);
-
+                       newfile = concat_path_file(filename, name);
                        sum += du(newfile);
+                       free(newfile);
                }
                closedir(dir);
                print(sum, filename);
@@ -133,55 +137,57 @@ 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': disp_hr = 0;        break;
+                       case 'm': disp_hr = MEGABYTE; break;
+#endif
+                       case 'k': break;
                        default:
-                               fprintf(stderr, "du: 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();
                }
        }
 
-       exit(0);
+       return status;
 }
 
-/* $Id: du.c,v 1.18 2000/04/28 00:18:56 erik Exp $ */
+/* $Id: du.c,v 1.47 2001/05/07 22:49:43 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"