diff options
author | Jim Meyering <jim@meyering.net> | 1999-12-27 14:17:39 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-12-27 14:17:39 +0000 |
commit | dc334520129c6e901096ef8076ba0c8cf76e501c (patch) | |
tree | 39edbe63656a711929bff4ea8c0658b3cff9fb90 /lib | |
parent | f71e656070c8cc83ffae62c7d31aa0ee759f37c2 (diff) | |
download | coreutils-dc334520129c6e901096ef8076ba0c8cf76e501c.tar.xz |
*** empty log message ***
Diffstat (limited to 'lib')
-rw-r--r-- | lib/nanosleep.c | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/lib/nanosleep.c b/lib/nanosleep.c index 126a02622..42f179c55 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -36,38 +36,29 @@ extern int errno; #include <sys/time.h> static int suspended; +int first_call = 1; /* Handle SIGCONT. */ static void sighandler (int sig) { -#ifdef SA_INTERRUPT - struct sigaction sigact; - - sigact.sa_handler = SIG_DFL; - sigemptyset (&sigact.sa_mask); - sigact.sa_flags = 0; - sigaction (sig, &sigact, NULL); -#else - signal (sig, SIG_DFL); -#endif - suspended = 1; - kill (getpid (), sig); } -/* Sleep for USEC microseconds. */ +/* FIXME: comment */ static void 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; + tv_delay.tv_usec = ts_delay->tv_nsec / 1000; select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay); } +/* FIXME: comment */ + int nanosleep (const struct timespec *requested_delay, struct timespec *remaining_delay) @@ -78,19 +69,23 @@ nanosleep (const struct timespec *requested_delay, suspended = 0; - /* set up sig handler -- but maybe only do this the first time? */ + /* set up sig handler */ + if (first_call) + { #ifdef SA_INTERRUPT - newact.sa_handler = sighandler; - sigemptyset (&newact.sa_mask); - newact.sa_flags = 0; + newact.sa_handler = sighandler; + sigemptyset (&newact.sa_mask); + newact.sa_flags = 0; - sigaction (SIGCONT, NULL, &oldact); - if (oldact.sa_handler != SIG_IGN) - sigaction (SIGCONT, &newact, NULL); + sigaction (SIGCONT, NULL, &oldact); + if (oldact.sa_handler != SIG_IGN) + sigaction (SIGCONT, &newact, NULL); #else - if (signal (SIGCONT, SIG_IGN) != SIG_IGN) - signal (SIGCONT, sighandler); + if (signal (SIGCONT, SIG_IGN) != SIG_IGN) + signal (SIGCONT, sighandler); #endif + first_call = 0; + } my_usleep (requested_delay); @@ -99,11 +94,11 @@ nanosleep (const struct timespec *requested_delay, /* Calculate time remaining. */ /* FIXME: the code in sleep doesn't use this, so there's no rush to implement it. */ + + errno = EINTR; } /* FIXME: Restore sig handler? */ - errno = EINTR; - return suspended; } |