From 34c6851c4aae0f54b997d8c59f925ab5bef91fc1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 26 Dec 1999 10:16:18 +0000 Subject: [PATCH] *** empty log message *** --- lib/nanosleep.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/nanosleep.c b/lib/nanosleep.c index b51f648..d5789bd 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -22,11 +22,15 @@ #include #include +#if HAVE_UNISTD_H +# include +#endif + #include /* FIXME: is including both like this kosher? */ #include -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; } -- 2.7.4