Add a compile-time check to ensure that filetype

and filetype_letter have the same number of elements.

diff --git a/ChangeLog b/ChangeLog
index 34b4372..ccb32c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-09  Jim Meyering  <jim@meyering.net>
 
+       * src/ls.c: Add a compile-time check to ensure that filetype
+       and filetype_letter have the same number of elements.
+
        * tests/misc/sort-rand: Remove use of --seed=S.
 
 2006-08-08  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/src/ls.c b/src/ls.c
index 85a4bc7..40de927 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -162,9 +162,12 @@ enum filetype
 
 /* Display letters and indicators for each filetype.
    Keep these in sync with enum filetype.  */
-
 static char const filetype_letter[] = "?pcdb-lswd";
 
+/* Ensure that filetype and filetype_letter have the same
+   number of elements.  */
+verify (sizeof filetype_letter - 1 == arg_directory + 1);
+
 #define FILETYPE_INDICATORS                            \
   {                                                    \
     C_ORPHAN, C_FIFO, C_CHR, C_DIR, C_BLK, C_FILE,     \