ncurses 5.4

[ncurses.git] / ncurses / tty / lib_twait.c

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index a907914accd71aaa72c0be764771771bf2a68b76..7402a10354fc694c5ac21ebc1d008c7d956614f4 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -61,7 +61,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: lib_twait.c,v 1.46 2002/09/01 00:28:18 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.49 2003/11/30 00:34:36 Philippe.Blain Exp $")
 
 static long
 _nc_gettime(bool first)
@@ -75,9 +75,16 @@ _nc_gettime(bool first)
     gettimeofday(&t1, (struct timezone *) 0);
     if (first) {
        t0 = t1;
+       res = 0;
+    } else {
+       /* .tv_sec and .tv_usec are unsigned, be careful when subtracting */
+       if (t0.tv_usec > t1.tv_usec) {  /* Convert 1s in 1e6 microsecs */
+           t1.tv_usec += 1000000;
+           t1.tv_sec--;
+       }
+       res = (t1.tv_sec - t0.tv_sec) * 1000
+           + (t1.tv_usec - t0.tv_usec) / 1000;
     }
-    res = (t1.tv_sec - t0.tv_sec) * 1000
-       + (t1.tv_usec - t0.tv_usec) / 1000;
 #else
 # define PRECISE_GETTIME 0
     static time_t t0;
@@ -380,7 +387,7 @@ _nc_timed_wait(int mode,
     }
 #endif
 
-#if PRECISE_GETTIME
+#if PRECISE_GETTIME && HAVE_NANOSLEEP
     /*
      * If the timeout hasn't expired, and we've gotten no data,
      * this is probably a system where 'select()' needs to be left
@@ -388,7 +395,7 @@ _nc_timed_wait(int mode,
      * then come back for more.
      */
     if (result == 0 && milliseconds > 100) {
-       napms(100);
+       napms(100);             /* FIXME: this won't be right if I recur! */
        milliseconds -= 100;
        goto retry;
     }