Patch from Edward Betts <edward@debian.org> to add -x switch to du.c

diff --git a/coreutils/du.c b/coreutils/du.c
index e34a7f46f9f14dd50bb541eeda09d3b677e69cd7..ed9f7156a1e87f90fce7da62fb81f4fa115d3dfe 100644 (file)
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -4,6 +4,7 @@
  *
  * 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
@@ -40,6 +41,8 @@ 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;
 
@@ -69,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);
@@ -133,7 +140,7 @@ int du_main(int argc, char **argv)
        print = print_normal;
 
        /* parse argv[] */
-       while ((c = getopt(argc, argv, "sl"
+       while ((c = getopt(argc, argv, "slx"
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
 "hm"
 #endif
@@ -145,6 +152,9 @@ int du_main(int argc, char **argv)
                        case 'l':
                                        count_hardlinks = 1;
                                        break;
+                       case 'x':
+                                       one_file_system = 1;
+                                       break;
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
                        case 'h': disp_hr = 0;        break;
                        case 'm': disp_hr = MEGABYTE; break;
@@ -174,7 +184,7 @@ int du_main(int argc, char **argv)
        return status;
 }
 
-/* $Id: du.c,v 1.52 2001/12/17 15:26:25 kraai Exp $ */
+/* $Id: du.c,v 1.53 2002/04/06 23:16:44 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"

diff --git a/include/usage.h b/include/usage.h
index e7de6f53fc4fff6321ec1dc01607a64bc84e8681..98a9f32cd0a0b8b798ce05a2360c9363f3d28fe3 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -343,7 +343,7 @@
        "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
 
 #define du_trivial_usage \
-       "[-ls" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [FILE]..."
+       "[-lsx" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [FILE]..."
 #define du_full_usage \
        "Summarizes disk space used for each FILE and/or directory.\n" \
        "Disk space is printed in units of 1024 bytes.\n\n" \
@@ -353,6 +353,7 @@
        USAGE_HUMAN_READABLE( \
        "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
        "\t-m\tprint sizes in megabytes\n" \
+       "\t-x\tskip directories on different filesystems\n" \
        "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define du_example_usage \