summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-07-25 15:25:37 +0000
committerJim Meyering <jim@meyering.net>2006-07-25 15:25:37 +0000
commit5a06d062c78b2f0b755eef9c4ec2faaf385fa6ac (patch)
treeb500a02a0db7638f232f79912ca34138848d2d89
parent3a208b14048121755eb01377f985372561a4b953 (diff)
downloadcoreutils-5a06d062c78b2f0b755eef9c4ec2faaf385fa6ac.tar.xz
* src/ls.c (gobble_file) [USE_ACL]: Don't use-uninitialized the
have_acl member. That would happen for a directory with both a non-stat'able entry and one with an ACL.
-rw-r--r--ChangeLog4
-rw-r--r--src/ls.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f95ec10fe..e5cfb9cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-07-25 Jim Meyering <jim@meyering.net>
+ * src/ls.c (gobble_file) [USE_ACL]: Don't use-uninitialized the
+ have_acl member. That would happen for a directory with both a
+ non-stat'able entry and one with an ACL.
+
* src/ls.c (gobble_file): Make it so failure to stat a
non-command-line file provokes an exit status of 1, not 0.
Say "cannot access" rather than "cannot stat".
diff --git a/src/ls.c b/src/ls.c
index 64411d19e..67f16bd6b 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -2622,6 +2622,9 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
f->filetype = type;
memset (&f->stat, '\0', sizeof (f->stat));
+#if USE_ACL
+ f->have_acl = false;
+#endif
f->name = xstrdup (absolute_name);
files_index++;