diff options
| author | Jim Meyering <jim@meyering.net> | 2007-01-13 17:13:49 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-03-29 21:37:05 +0200 |
| commit | 5a233cb81e5238c0ed993a371519a20a04bce58d (patch) | |
| tree | c008cfc8c51f9c12f8beec1203114aff7978e5b0 | |
| parent | 5dd7f137b7c4cbbecc9ddbc2ae7578dcf001c884 (diff) | |
| download | coreutils-5a233cb81e5238c0ed993a371519a20a04bce58d.tar.xz | |
* src/c99-to-c89.diff: Handle a new c99'ism in ls.c.
| -rw-r--r-- | ChangeLog-selinux | 2 | ||||
| -rw-r--r-- | src/c99-to-c89.diff | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog-selinux b/ChangeLog-selinux index f8f92c3f4..0d3b8e3b1 100644 --- a/ChangeLog-selinux +++ b/ChangeLog-selinux @@ -1,5 +1,7 @@ 2007-01-13 Jim Meyering <jim@meyering.net> + * src/c99-to-c89.diff: Handle a new c99'ism in ls.c. + * src/id.c (main): Tweak id -Z diagnostic. id: Add SELinux support: -Z option. diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff index 4e1aa4aa3..a56821e45 100644 --- a/src/c99-to-c89.diff +++ b/src/c99-to-c89.diff @@ -115,3 +115,23 @@ diff -u -p -r1.130 shred.c if (errnum == EIO && 0 <= size && (soff | SECTOR_MASK) < lim) { size_t soff1 = (soff | SECTOR_MASK) + 1; +diff --git a/src/ls.c b/src/ls.c +index b1c0f9a..7d51a61 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -2565,6 +2565,7 @@ gobble_file (char const *name, enum filetype type, ino_t inode, + ))))) + + { ++ bool file_has_security_context = false; + /* Absolute name of this file. */ + char *absolute_name; + bool do_deref; +@@ -2614,7 +2615,6 @@ gobble_file (char const *name, enum filetype type, ino_t inode, + break; + } + +- bool file_has_security_context = false; + if (err == 0 && (format == long_format || print_scontext)) + { + int attr_len = (do_deref |