Fail silently on failure to read tar header, its unfortunate that many tar implementa...

[oweals/busybox.git] / du.c

diff --git a/du.c b/du.c
index 5636de8eacc1564ee938b1566a52664bb238484b..fb649aee5e15f6720bec55ee5f4caebc9fbceb41 100644 (file)
--- a/du.c
+++ b/du.c
@@ -28,15 +28,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
+#include <string.h>
 #include <errno.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
-#include "messages.c"
 
 
 #ifdef BB_FEATURE_HUMAN_READABLE
-unsigned long du_disp_hr = KILOBYTE;
+static unsigned long disp_hr = KILOBYTE;
 #endif
 
 typedef void (Display) (long, char *);
@@ -49,7 +47,7 @@ static Display *print;
 static void print_normal(long size, char *filename)
 {
 #ifdef BB_FEATURE_HUMAN_READABLE
-       printf("%s\t%s\n", format((size * KILOBYTE), du_disp_hr), filename);
+       printf("%s\t%s\n", make_human_readable_str(size<<10, 1, disp_hr), filename);
 #else
        printf("%ld\t%s\n", size, filename);
 #endif
@@ -58,20 +56,91 @@ static void print_normal(long size, char *filename)
 static void print_summary(long size, char *filename)
 {
        if (du_depth == 1) {
-printf("summary\n");
                print_normal(size, filename);
        }
 }
 
+#define HASH_SIZE       311             /* Should be prime */
+#define hash_inode(i)   ((i) % HASH_SIZE)
+
+typedef struct ino_dev_hash_bucket_struct {
+  struct ino_dev_hash_bucket_struct *next;
+  ino_t ino;
+  dev_t dev;
+  char name[1];
+} ino_dev_hashtable_bucket_t;
+
+static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
+
+/*
+ * Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
+ * `ino_dev_hashtable', else return 0
+ *
+ * If NAME is a non-NULL pointer to a character pointer, and there is
+ * a match, then set *NAME to the value of the name slot in that
+ * bucket.
+ */
+static int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
+{
+       ino_dev_hashtable_bucket_t *bucket;
+
+       bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
+       while (bucket != NULL) {
+         if ((bucket->ino == statbuf->st_ino) &&
+                 (bucket->dev == statbuf->st_dev))
+         {
+               if (name) *name = bucket->name;
+               return 1;
+         }
+         bucket = bucket->next;
+       }
+       return 0;
+}
+
+/* Add statbuf to statbuf hash table */
+static void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
+{
+       int i;
+       size_t s;
+       ino_dev_hashtable_bucket_t *bucket;
+
+       i = hash_inode(statbuf->st_ino);
+       s = name ? strlen(name) : 0;
+       bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
+       bucket->ino = statbuf->st_ino;
+       bucket->dev = statbuf->st_dev;
+       if (name)
+               strcpy(bucket->name, name);
+       else
+               bucket->name[0] = '\0';
+       bucket->next = ino_dev_hashtable[i];
+       ino_dev_hashtable[i] = bucket;
+}
+
+/* Clear statbuf hash table */
+static void reset_ino_dev_hashtable(void)
+{
+       int i;
+       ino_dev_hashtable_bucket_t *bucket;
+
+       for (i = 0; i < HASH_SIZE; i++) {
+               while (ino_dev_hashtable[i] != NULL) {
+                       bucket = ino_dev_hashtable[i]->next;
+                       free(ino_dev_hashtable[i]);
+                       ino_dev_hashtable[i] = bucket;
+               }
+       }
+}
+
 /* tiny recursive du */
 static long du(char *filename)
 {
        struct stat statbuf;
        long sum;
-       int len;
 
        if ((lstat(filename, &statbuf)) != 0) {
-               perror_msg_and_die("%s", filename);
+               perror_msg("%s", filename);
+               return 0;
        }
 
        du_depth++;
@@ -80,12 +149,13 @@ static long du(char *filename)
        /* Don't add in stuff pointed to by symbolic links */
        if (S_ISLNK(statbuf.st_mode)) {
                sum = 0L;
-               if (du_depth == 1)
-                       print(sum, filename);
+               if (du_depth == 1) {
+               }
        }
        if (S_ISDIR(statbuf.st_mode)) {
                DIR *dir;
                struct dirent *entry;
+               char *newfile;
 
                dir = opendir(filename);
                if (!dir) {
@@ -93,27 +163,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) {
-                               error_msg(name_too_long);
-                               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);
@@ -156,8 +219,8 @@ int du_main(int argc, char **argv)
                                        count_hardlinks = 1;
                                        break;
 #ifdef BB_FEATURE_HUMAN_READABLE
-                       case 'h': du_disp_hr = 0;        break;
-                       case 'm': du_disp_hr = MEGABYTE; break;
+                       case 'h': disp_hr = 0;        break;
+                       case 'm': disp_hr = MEGABYTE; break;
 #endif
                        case 'k': break;
                        default:
@@ -173,8 +236,7 @@ int du_main(int argc, char **argv)
                long sum;
 
                for (i=optind; i < argc; i++) {
-                       if ((sum = du(argv[i])) == 0)
-                               status = EXIT_FAILURE;
+                       sum = du(argv[i]);
                        if(is_directory(argv[i], FALSE, NULL)==FALSE) {
                                print_normal(sum, argv[i]);
                        }
@@ -185,7 +247,7 @@ int du_main(int argc, char **argv)
        return status;
 }
 
-/* $Id: du.c,v 1.39 2001/03/06 23:14:43 andersen Exp $ */
+/* $Id: du.c,v 1.50 2001/06/30 17:54:20 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"