* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

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

diff --git a/coreutils/du.c b/coreutils/du.c
index fb649aee5e15f6720bec55ee5f4caebc9fbceb41..ed9f7156a1e87f90fce7da62fb81f4fa115d3dfe 100644 (file)
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -2,9 +2,9 @@
 /*
  * Mini du implementation for busybox
  *
- *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by John Beppu <beppu@lineo.com>
+ * Copyright (C) 1999,2000,2001 by Lineo, inc. and John Beppu
+ * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
+ * Copyright (C) 2002  Edward Betts <edward@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 #include "busybox.h"
 
 
-#ifdef BB_FEATURE_HUMAN_READABLE
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
 static unsigned long disp_hr = KILOBYTE;
 #endif
 
@@ -41,12 +41,14 @@ typedef void (Display) (long, char *);
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
+static int one_file_system = 0;
+static dev_t dir_dev = 0;
 
 static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-#ifdef BB_FEATURE_HUMAN_READABLE
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
        printf("%s\t%s\n", make_human_readable_str(size<<10, 1, disp_hr), filename);
 #else
        printf("%ld\t%s\n", size, filename);
@@ -60,78 +62,6 @@ static void print_summary(long size, char *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)
 {
@@ -142,6 +72,10 @@ static long du(char *filename)
                perror_msg("%s", filename);
                return 0;
        }
+       if (du_depth == 0)
+               dir_dev = statbuf.st_dev;
+       else if (one_file_system && dir_dev != statbuf.st_dev)
+               return 0;
 
        du_depth++;
        sum = (statbuf.st_blocks >> 1);
@@ -206,8 +140,8 @@ int du_main(int argc, char **argv)
        print = print_normal;
 
        /* parse argv[] */
-       while ((c = getopt(argc, argv, "sl"
-#ifdef BB_FEATURE_HUMAN_READABLE
+       while ((c = getopt(argc, argv, "slx"
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
 "hm"
 #endif
 "k")) != EOF) {
@@ -218,7 +152,10 @@ int du_main(int argc, char **argv)
                        case 'l':
                                        count_hardlinks = 1;
                                        break;
-#ifdef BB_FEATURE_HUMAN_READABLE
+                       case 'x':
+                                       one_file_system = 1;
+                                       break;
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
                        case 'h': disp_hr = 0;        break;
                        case 'm': disp_hr = MEGABYTE; break;
 #endif
@@ -247,7 +184,7 @@ int du_main(int argc, char **argv)
        return status;
 }
 
-/* $Id: du.c,v 1.50 2001/06/30 17:54:20 andersen Exp $ */
+/* $Id: du.c,v 1.53 2002/04/06 23:16:44 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"