Fix calls to {m,c,re}alloc so that they use x{m,c,re}alloc instead of

[oweals/busybox.git] / coreutils / du.c

diff --git a/coreutils/du.c b/coreutils/du.c
index 7b5acb490dd6a58c878b6455cd5693297e00e20a..5a08abb78746d22f52c1f6cfc692da5555aeef96 100644 (file)
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -3,7 +3,7 @@
  * Mini du implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,22 +32,17 @@
 #include <dirent.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/param.h>                 /* for PATH_MAX */
 
 typedef void (Display) (long, char *);
 
-static const char du_usage[] =
-
-       "du [OPTION]... [FILE]...\n\n"
-       "\t-s\tdisplay only a total for each argument\n";
-
 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);
+       fprintf(stdout, "%ld\t%s\n", size, filename);
 }
 
 static void print_summary(long size, char *filename)
@@ -57,24 +52,26 @@ static void print_summary(long size, char *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));
+               printf("du: %s: %s\n", filename, strerror(errno));
                return 0;
        }
 
        du_depth++;
        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 +79,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 +96,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) {
+                               errorMsg(name_too_long);
+                               du_depth--;
                                return 0;
                        }
                        sprintf(newfile, "%s/%s", filename, name);
@@ -104,6 +108,17 @@ 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;
 }
@@ -111,46 +126,48 @@ 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;
-                       case 'h':
-                               usage(du_usage);
-                               break;
+                                       print = print_summary;
+                                       break;
+                       case 'l':
+                                       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))) {
+                       if (sum && isDirectory(argv[i], FALSE, NULL)) {
                                print_normal(sum, argv[i]);
                        }
+                       reset_ino_dev_hashtable();
                }
        }
 
-       exit(0);
+       return(0);
 }
 
-/* $Id: du.c,v 1.13 2000/02/13 04:10:57 beppu Exp $ */
+/* $Id: du.c,v 1.24 2000/07/17 16:17:19 proski Exp $ */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/