summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1999-12-26 10:16:18 +0000
committerJim Meyering <jim@meyering.net>1999-12-26 10:16:18 +0000
commita530b32c83450e51f8d53aa89c5f4735cebdc77c (patch)
tree9e7dd3eeaa11986e951393ceb2b5415ca2aded62
parent9a4a47046794ea88d4bef6038da0c5afaef01f46 (diff)
downloadgnulib-a530b32c83450e51f8d53aa89c5f4735cebdc77c.tar.gz
*** empty log message ***
-rw-r--r--lib/nanosleep.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index b51f648c7a..d5789bd465 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -22,11 +22,15 @@
#include <sys/types.h>
#include <signal.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
#include <time.h>
/* FIXME: is including both like this kosher? */
#include <sys/time.h>
-static interrupted;
+static int suspended;
/* Handle SIGCONT. */
@@ -51,12 +55,12 @@ sighandler (int sig)
/* Sleep for USEC microseconds. */
static void
-usleep (const struct timespec *ts_delay)
+my_usleep (const struct timespec *ts_delay)
{
struct timeval tv_delay;
tv_delay.tv_sec = ts_delay->tv_sec;
tv_delay.tv_usec = 1000 * ts_delay->tv_nsec;
- select (0, (void *) 0, (void *) 0, (void *) 0, tv_delay);
+ select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay);
}
int
@@ -67,7 +71,7 @@ nanosleep (const struct timespec *requested_delay,
struct sigaction oldact, newact;
#endif
- interrupted = 0;
+ suspended = 0;
/* set up sig handler -- but maybe only do this the first time? */
#ifdef SA_INTERRUPT
@@ -83,9 +87,9 @@ nanosleep (const struct timespec *requested_delay,
signal (SIGCONT, sighandler);
#endif
- usleep (requested_delay);
+ my_usleep (requested_delay);
- if (interrupted)
+ if (suspended)
{
/* Calculate time remaining. */
/* FIXME: the code in sleep doesn't use this, so there's no
@@ -94,5 +98,5 @@ nanosleep (const struct timespec *requested_delay,
/* FIXME: Restore sig handler? */
- return interrupted;
+ return suspended;
}