* src/c99-to-c89.diff: Handle a new c99'ism in ls.c.

diff --git a/ChangeLog-selinux b/ChangeLog-selinux
index f8f92c3f4af927b1db5bb06fe33af4f90cff65bc..0d3b8e3b14b47619d6fa95e624db70243a525d37 100644 (file)
--- 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 4e1aa4aa3fb7284b27d72774f4252a053db63915..a56821e45f3b912d0085dfbd707b5ace62c9a90b 100644 (file)
--- 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