summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-05-20 07:19:53 +0000
committerJim Meyering <jim@meyering.net>2006-05-20 07:19:53 +0000
commitc58e7ee1ccbf846f77313fa7bd6000b26730d8cb (patch)
treecc28041e134c9f6e6185e0571d007aa04763553c
parentc11a92383d93e474734eab8c44af3b5d518058f0 (diff)
downloadcoreutils-c58e7ee1ccbf846f77313fa7bd6000b26730d8cb.tar.xz
(main): Rename local, s/symlink_deref_bit/symlink_deref_bits/
and arrange for -D to set fts' FTS_PHYSICAL bit as well as FTS_COMFOLLOW. Spotted by Justin Pryzby.
-rw-r--r--src/du.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/du.c b/src/du.c
index 5e7065eae..bb6d1ec22 100644
--- a/src/du.c
+++ b/src/du.c
@@ -685,7 +685,7 @@ main (int argc, char **argv)
/* Select one of the three FTS_ options that control if/when
to follow a symlink. */
- int symlink_deref_bit = FTS_PHYSICAL;
+ int symlink_deref_bits = FTS_PHYSICAL;
/* If true, display only a total for each argument. */
bool opt_summarize_only = false;
@@ -807,15 +807,15 @@ main (int argc, char **argv)
break;
case 'D': /* This will eventually be 'H' (-H), too. */
- symlink_deref_bit = FTS_COMFOLLOW;
+ symlink_deref_bits = FTS_COMFOLLOW | FTS_PHYSICAL;
break;
case 'L': /* --dereference */
- symlink_deref_bit = FTS_LOGICAL;
+ symlink_deref_bits = FTS_LOGICAL;
break;
case 'P': /* --no-dereference */
- symlink_deref_bit = FTS_PHYSICAL;
+ symlink_deref_bits = FTS_PHYSICAL;
break;
case 'S':
@@ -1004,7 +1004,7 @@ main (int argc, char **argv)
ok = (i == j);
}
- bit_flags |= symlink_deref_bit;
+ bit_flags |= symlink_deref_bits;
ok &= du_files (files, bit_flags);
/* This isn't really necessary, but it does ensure we