Update Gnulib to v0.0-6703-g4e0358a.

[bpt/guile.git] / lib / stat-time.h

diff --git a/lib/stat-time.h b/lib/stat-time.h
index 47a288a..2d01910 100644 (file)
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -142,7 +142,7 @@ get_stat_mtime (struct stat const *st)
 }
 
 /* Return *ST's birth time, if available; otherwise return a value
 }
 
 /* Return *ST's birth time, if available; otherwise return a value

-   with negative tv_nsec.  */
+   with tv_sec and tv_nsec both equal to -1.  */

 static inline struct timespec
 get_stat_birthtime (struct stat const *st)
 {
 static inline struct timespec
 get_stat_birthtime (struct stat const *st)
 {


@@ -161,7 +161,7 @@ get_stat_birthtime (struct stat const *st)
   t.tv_sec = st->st_ctime;
   t.tv_nsec = 0;
 #else
   t.tv_sec = st->st_ctime;
   t.tv_nsec = 0;
 #else

-  /* Birth time is not supported.  Set tv_sec to avoid undefined behavior.  */
+  /* Birth time is not supported.  */

   t.tv_sec = -1;
   t.tv_nsec = -1;
   /* Avoid a "parameter unused" warning.  */
   t.tv_sec = -1;
   t.tv_nsec = -1;
   /* Avoid a "parameter unused" warning.  */


@@ -175,10 +175,12 @@ get_stat_birthtime (struct stat const *st)
      using zero.  Attempt to work around this problem.  Alas, this can
      report failure even for valid time stamps.  Also, NetBSD
      sometimes returns junk in the birth time fields; work around this
      using zero.  Attempt to work around this problem.  Alas, this can
      report failure even for valid time stamps.  Also, NetBSD
      sometimes returns junk in the birth time fields; work around this

-     bug if it is detected.  There's no need to detect negative
-     tv_nsec junk as negative tv_nsec already indicates an error.  */
-  if (t.tv_sec == 0 || 1000000000 <= t.tv_nsec)
-    t.tv_nsec = -1;
+     bug if it is detected.  */
+  if (! (t.tv_sec && 0 <= t.tv_nsec && t.tv_nsec < 1000000000))
+    {
+      t.tv_sec = -1;
+      t.tv_nsec = -1;
+    }

 #endif
 
   return t;
 #endif
 
   return t;