summaryrefslogtreecommitdiff
path: root/coreutils/du.c
diff options
context:
space:
mode:
authorEric Andersen2002-04-06 23:16:44 +0000
committerEric Andersen2002-04-06 23:16:44 +0000
commit265d229427dc35456dec37215142a3b0e06903df (patch)
tree0fd5ef5f1b9a86159d807993480e678dbed9e0f6 /coreutils/du.c
parentfcffa2cc1a0f11ea6a075dd37762ca5b543b55e1 (diff)
downloadbusybox-265d229427dc35456dec37215142a3b0e06903df.zip
busybox-265d229427dc35456dec37215142a3b0e06903df.tar.gz
Patch from Edward Betts <edward@debian.org> to add -x switch to du.c
Diffstat (limited to 'coreutils/du.c')
-rw-r--r--coreutils/du.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/coreutils/du.c b/coreutils/du.c
index e34a7f4..ed9f715 100644
--- 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"