From 7f41a65ede0cf293dea3ae3aa55a2689b9a46873 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Tue, 8 Sep 1998 09:44:46 +0000 Subject: [PATCH] restore rev 1.23 to give clear SIGALRM handling example, 68 years are too long to affect real code --- lib/libc/gen/sleep.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c index 90ed333653c0..faedfa9ce268 100644 --- a/lib/libc/gen/sleep.c +++ b/lib/libc/gen/sleep.c @@ -44,38 +44,26 @@ static char rcsid[] = #include #include -/* - * sleep() - attempt to sleep the specified number of seconds, returning - * any remaining unslept time if interrupted or 0 if the entire - * sleep completes without being interrupted. Avoid seconds vs - * time_t typing problems by breaking down large times with a - * loop. - */ - unsigned int sleep(seconds) unsigned int seconds; { - while (seconds != 0) { - struct timespec time_to_sleep; - struct timespec time_remaining; + struct timespec time_to_sleep; + struct timespec time_remaining; - time_to_sleep.tv_sec = (seconds > INT_MAX) ? INT_MAX : seconds; - time_to_sleep.tv_nsec = 0; + /* + * Avoid overflow when `seconds' is huge. This assumes that + * the maximum value for a time_t is >= INT_MAX. + */ + if (seconds > INT_MAX) + return (seconds - INT_MAX + sleep(INT_MAX)); - if (nanosleep(&time_to_sleep, &time_remaining) == -1) { - /* - * time_remaining only valid if EINTR, else assume no - * time elapsed. - */ - if (errno == EINTR) - seconds -= time_to_sleep.tv_sec - time_remaining.tv_sec; - if (time_remaining.tv_nsec) - ++seconds; - break; - } - seconds -= time_to_sleep.tv_sec; - } - return(seconds); + time_to_sleep.tv_sec = seconds; + time_to_sleep.tv_nsec = 0; + if (nanosleep(&time_to_sleep, &time_remaining) != -1) + return (0); + if (errno != EINTR) + return (seconds); /* best guess */ + return (time_remaining.tv_sec + + (time_remaining.tv_nsec != 0)); /* round up */ } -