diff options
| -rw-r--r-- | ChangeLog-selinux | 3 | ||||
| -rw-r--r-- | src/c99-to-c89.diff | 20 |
2 files changed, 3 insertions, 20 deletions
diff --git a/ChangeLog-selinux b/ChangeLog-selinux index fbae67e55..d89fb5e26 100644 --- a/ChangeLog-selinux +++ b/ChangeLog-selinux @@ -1,5 +1,8 @@ 2007-01-13 Jim Meyering <jim@meyering.net> + * src/c99-to-c89.diff: Remove the ls.c patch, now that I've + temporarily removed the offending c99'ism. + * src/chcon.c (usage): Split a string literal that was longer than 509. * src/ls.c (gobble_file): Don't call getfilecon unless print_scontext. diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff index efddfad11..4e1aa4aa3 100644 --- a/src/c99-to-c89.diff +++ b/src/c99-to-c89.diff @@ -115,23 +115,3 @@ 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 |