timespec: long-to-int truncation could make timespec_cmp malfunction

* lib/timespec.h (timespec_cmp): Do not interpret a difference of
a multiple of 2^32 nanoseconds as no difference.

diff --git a/ChangeLog b/ChangeLog
index 7982453a86afada814c886c4cc6629d2780712bf..b2073ee7b14832740ef2327c471020d36e73cd61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-29  Jim Meyering  <meyering@redhat.com>
+
+       timespec: long-to-int truncation could make timespec_cmp malfunction
+       * lib/timespec.h (timespec_cmp): Do not interpret a difference of
+       a multiple of 2^32 nanoseconds as no difference.
+
 2009-10-28  Jim Meyering  <meyering@redhat.com>
 
        fprintftime: wrap macro code argument in "do {...} while(0)"

diff --git a/lib/timespec.h b/lib/timespec.h
index 3f51db8e4d9382bc2763b41fc0e01d6c26a10a39..db3453a24cbd81d7ecbfbc9b76442288ec72b98f 100644 (file)
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -1,6 +1,6 @@
 /* timespec -- System time interface
 
-   Copyright (C) 2000, 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,9 @@ timespec_cmp (struct timespec a, struct timespec b)
 {
   return (a.tv_sec < b.tv_sec ? -1
          : a.tv_sec > b.tv_sec ? 1
-         : a.tv_nsec - b.tv_nsec);
+         : a.tv_nsec < b.tv_nsec ? -1
+         : a.tv_nsec > b.tv_nsec ? 1
+         : 0);
 }
 
 void gettime (struct timespec *);