Use a more robust test for a "can't happen" condition.

* lib/fts.c (fts_read): Revert the change of 2006-11-22, since it
narrowed the st_size value.  Presuming the "can't happen" condition
is true, that narrowing could conceivably convert an invalid st_size
value into a valid one.  Instead, use a change based on Matthew
Woehlke's original patch.

diff --git a/ChangeLog b/ChangeLog
index 88e40752d7df68902e9967d8375daa9b041a7c33..bb9da15abba696502f458396e58b34ea4be390d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-01-08  Jim Meyering  <jim@meyering.net>
 
+       Use a more robust test for a "can't happen" condition.
+       * lib/fts.c (fts_read): Revert the change of 2006-11-22, since it
+       narrowed the st_size value.  Presuming the "can't happen" condition
+       is true, that narrowing could conceivably convert an invalid st_size
+       value into a valid one.  Instead, use a change based on Matthew
+       Woehlke's original patch.
+
        Slight readability improvement: use an assert-like macro
        in place of literal "abort ()" uses.
        * lib/fts.c (fts_assert): Define.

diff --git a/lib/fts.c b/lib/fts.c
index afb296d1b5b8a1466f5f23dc7faae27b148e7451..9482833a04518abab15ef575eb92afa371d07efb 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -740,17 +740,10 @@ name:             t = sp->fts_path + NAPPEND(p->fts_parent);
 check_for_dir:
                if (p->fts_info == FTS_NSOK)
                  {
-                   enum Fts_stat need_stat = p->fts_statp->st_size;
-                   switch (need_stat)
-                     {
-                     case FTS_STAT_REQUIRED:
-                       p->fts_info = fts_stat(sp, p, false);
-                       break;
-                     case FTS_NO_STAT_REQUIRED:
-                       break;
-                     default:
-                       fts_assert (0);
-                     }
+                   if (p->fts_statp->st_size == FTS_STAT_REQUIRED)
+                     p->fts_info = fts_stat(sp, p, false);
+                   else
+                     fts_assert (p->fts_statp->st_size == FTS_NO_STAT_REQUIRED);
                  }
 
                sp->fts_cur = p;