* 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 3e4821a390010fa885d1a2937963f43eac2a025d..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,24 +41,15 @@ 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)
 {
-       unsigned long base;
-#ifdef BB_FEATURE_HUMAN_READABLE
-       switch (disp_hr) {
-               case MEGABYTE:
-                       base = KILOBYTE;
-                       break;
-               case KILOBYTE:
-                       base = 1;
-                       break;
-               default:
-                       base = 0;
-       }
-       printf("%s\t%s\n", make_human_readable_str(size, base), filename);
+#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);
 #endif
@@ -81,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);
@@ -88,8 +83,8 @@ 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;
@@ -145,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) {
@@ -157,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
@@ -175,8 +173,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]);
                        }
@@ -187,7 +184,7 @@ int du_main(int argc, char **argv)
        return status;
 }
 
-/* $Id: du.c,v 1.47 2001/05/07 22:49:43 andersen Exp $ */
+/* $Id: du.c,v 1.53 2002/04/06 23:16:44 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"