More cleanups.

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index 4dc7ea13ad3703f2910b4d1b0f634e082d1b2270..b1ca954366159d6b6738fae05761b8428cd853a5 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 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,27 +32,19 @@
 #include <dirent.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/param.h>                 /* for PATH_MAX */
 
 typedef void (Display) (long, char *);
 
-typedef struct inode_type {
-       struct inode_type *next;
-       ino_t ino;
-} INODETYPE;
-
-#define HASH_SIZE      311             /* Should be prime */
-#define hash_inode(i)  ((i) % HASH_SIZE)
-
-static INODETYPE *inode_hash_list[HASH_SIZE];
-
 static const char du_usage[] =
-       "du [OPTION]... [FILE]...\n\n"
-       "Summarize disk space used for each FILE and/or directory.\n"
+       "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";
+       "\t-s\tdisplay only a total for each argument\n"
+#endif
+       ;
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
@@ -71,52 +63,6 @@ static void print_summary(long size, char *filename)
        }
 }
 
-/* Return 1 if inode is in inode hash list, else return 0 */
-static int is_in_list(const ino_t ino)
-{
-       INODETYPE *inode;
-
-       inode = inode_hash_list[hash_inode(ino)];
-       while (inode != NULL) {
-               if (inode->ino == ino)
-                       return 1;
-               inode = inode->next;
-       }
-
-       return 0;
-}
-
-/* Add inode to inode hash list */
-static void add_inode(const ino_t ino)
-{
-       int i;
-       INODETYPE *inode;
-    
-       i = hash_inode(ino);
-       inode = malloc(sizeof(INODETYPE));
-       if (inode == NULL)
-               fatalError("du: Not enough memory.");
-
-       inode->ino = ino;
-       inode->next = inode_hash_list[i];
-       inode_hash_list[i] = inode;
-}
-
-/* Clear inode hash list */
-static void reset_inode_list(void)
-{
-       int i;
-       INODETYPE *inode;
-
-       for (i = 0; i < HASH_SIZE; i++) {
-               while (inode_hash_list[i] != NULL) {
-                       inode = inode_hash_list[i]->next;
-                       free(inode_hash_list[i]);
-                       inode_hash_list[i] = inode;
-               }
-       }
-}
-
 /* tiny recursive du */
 static long du(char *filename)
 {
@@ -153,7 +99,7 @@ static long du(char *filename)
                        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)
@@ -161,8 +107,8 @@ static long du(char *filename)
                                continue;
                        }
 
-                       if (len + 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;
                        }
@@ -175,13 +121,13 @@ static long du(char *filename)
        }
        else if (statbuf.st_nlink > 1 && !count_hardlinks) {
                /* Add files with hard links only once */
-               if (is_in_list(statbuf.st_ino)) {
+               if (is_in_ino_dev_hashtable(&statbuf, NULL)) {
                        sum = 0L;
                        if (du_depth == 1)
                                print(sum, filename);
                }
                else {
-                       add_inode(statbuf.st_ino);
+                       add_to_ino_dev_hashtable(&statbuf, NULL);
                }
        }
        du_depth--;
@@ -212,7 +158,7 @@ int du_main(int argc, char **argv)
                                usage(du_usage);
                                break;
                        default:
-                               fprintf(stderr, "du: invalid option -- %c\n", opt);
+                               errorMsg("invalid option -- %c\n", opt);
                                usage(du_usage);
                        }
                } else {
@@ -231,11 +177,18 @@ int du_main(int argc, char **argv)
                        if (sum && isDirectory(argv[i], FALSE, NULL)) {
                                print_normal(sum, argv[i]);
                        }
-                       reset_inode_list();
+                       reset_ino_dev_hashtable();
                }
        }
 
-       exit(0);
+       return(0);
 }
 
-/* $Id: du.c,v 1.15 2000/02/21 17:27:17 erik Exp $ */
+/* $Id: du.c,v 1.21 2000/07/14 01:51:25 kraai Exp $ */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/