It turns out that DODMALLOC was broken when I reorganized busybox.h

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index 91260588243d0e8af47189ecde628b1ffffae5e4..6197b0bc18115d40da1743c957be38691a5803bd 100644 (file)
--- a/du.c
+++ b/du.c
@@ -3,7 +3,7 @@
  * Mini du implementation for busybox
  *
  *
- * Copyright (C) 1999 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,59 +22,66 @@
  *
  */
 
-#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 <errno.h>
-#include <sys/param.h>                 /* for PATH_MAX */
+#include "busybox.h"
+#define BB_DECLARE_EXTERN
+#define bb_need_name_too_long
+#include "messages.c"
 
-typedef void (Display) (long, char *);
 
-static const char du_usage[] =
+#ifdef BB_FEATURE_HUMAN_READABLE
+unsigned long du_disp_hr = KILOBYTE;
+#endif
 
-       "du [OPTION]... [FILE]...\n\n"
-       "\t-s\tdisplay only a total for each argument\n";
+typedef void (Display) (long, char *);
 
 static int du_depth = 0;
+static int count_hardlinks = 0;
 
 static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-       fprintf(stdout, "%-7ld %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);
        }
 }
 
-
 /* tiny recursive du */
 static long du(char *filename)
 {
        struct stat statbuf;
        long sum;
+       int len;
 
        if ((lstat(filename, &statbuf)) != 0) {
-               fprintf(stdout, "du: %s: %s\n", filename, strerror(errno));
-               return 0;
+               perror_msg_and_die("%s", filename);
        }
 
        du_depth++;
-       sum = statbuf.st_blocks;
+       sum = (statbuf.st_blocks >> 1);
 
-       /* Don't add in stuff pointed to by links */
+       /* Don't add in stuff pointed to by symbolic links */
        if (S_ISLNK(statbuf.st_mode)) {
-               return 0;
+               sum = 0L;
+               if (du_depth == 1)
+                       print(sum, filename);
        }
        if (S_ISDIR(statbuf.st_mode)) {
                DIR *dir;
@@ -82,10 +89,16 @@ static long du(char *filename)
 
                dir = opendir(filename);
                if (!dir) {
+                       du_depth--;
                        return 0;
                }
+
+               len = strlen(filename);
+               if (filename[len - 1] == '/')
+                       filename[--len] = '\0';
+
                while ((entry = readdir(dir))) {
-                       char newfile[PATH_MAX + 1];
+                       char newfile[BUFSIZ + 1];
                        char *name = entry->d_name;
 
                        if ((strcmp(name, "..") == 0)
@@ -93,8 +106,9 @@ static long du(char *filename)
                                continue;
                        }
 
-                       if (strlen(filename) + strlen(name) + 1 > PATH_MAX) {
-                               fprintf(stderr, name_too_long, "du");
+                       if (len + strlen(name) + 1 > BUFSIZ) {
+                               error_msg(name_too_long);
+                               du_depth--;
                                return 0;
                        }
                        sprintf(newfile, "%s/%s", filename, name);
@@ -104,53 +118,80 @@ static long du(char *filename)
                closedir(dir);
                print(sum, filename);
        }
+       else if (statbuf.st_nlink > 1 && !count_hardlinks) {
+               /* Add files with hard links only once */
+               if (is_in_ino_dev_hashtable(&statbuf, NULL)) {
+                       sum = 0L;
+                       if (du_depth == 1)
+                               print(sum, filename);
+               }
+               else {
+                       add_to_ino_dev_hashtable(&statbuf, NULL);
+               }
+       }
        du_depth--;
        return sum;
 }
 
 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;
-                       case 'h':
-                               usage(du_usage);
-                               break;
+                                       print = print_summary;
+                                       break;
+                       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:
-                               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.12 2000/02/11 21:55:04 erik Exp $ */
+/* $Id: du.c,v 1.38 2001/02/20 06:14:07 andersen Exp $ */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/