Add include files to get prototype declarations, and fix bugs found.

[unix-history] / usr / src / lib / libc / gen / sleep.c

diff --git a/usr/src/lib/libc/gen/sleep.c b/usr/src/lib/libc/gen/sleep.c
index 34ab848..8237515 100644 (file)
--- a/usr/src/lib/libc/gen/sleep.c
+++ b/usr/src/lib/libc/gen/sleep.c
@@ -6,17 +6,19 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)sleep.c    5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)sleep.c    5.6 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/time.h>
 #include <sys/signal.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/time.h>
 #include <sys/signal.h>

+#include <unistd.h>

 
 #define        setvec(vec, a) \
        vec.sv_handler = a; vec.sv_mask = vec.sv_onstack = 0
 
 static int ringring;
 
 
 #define        setvec(vec, a) \
        vec.sv_handler = a; vec.sv_mask = vec.sv_onstack = 0
 
 static int ringring;
 

+unsigned int

 sleep(seconds)
        unsigned int seconds;
 {
 sleep(seconds)
        unsigned int seconds;
 {


@@ -24,15 +26,15 @@ sleep(seconds)
        struct itimerval itv, oitv;
        struct sigvec vec, ovec;
        long omask;
        struct itimerval itv, oitv;
        struct sigvec vec, ovec;
        long omask;

-       void sleephandler();
+       static void sleephandler();

 
        itp = &itv;
        if (!seconds)
 
        itp = &itv;
        if (!seconds)

-               return;
+               return 0;

        timerclear(&itp->it_interval);
        timerclear(&itp->it_value);
        if (setitimer(ITIMER_REAL, itp, &oitv) < 0)
        timerclear(&itp->it_interval);
        timerclear(&itp->it_value);
        if (setitimer(ITIMER_REAL, itp, &oitv) < 0)

-               return;
+               return seconds;

        itp->it_value.tv_sec = seconds;
        if (timerisset(&oitv.it_value)) {
                if (timercmp(&oitv.it_value, &itp->it_value, >))
        itp->it_value.tv_sec = seconds;
        if (timerisset(&oitv.it_value)) {
                if (timercmp(&oitv.it_value, &itp->it_value, >))


@@ -59,6 +61,7 @@ sleep(seconds)
        (void) sigvec(SIGALRM, &ovec, (struct sigvec *)0);
        (void) sigsetmask(omask);
        (void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0);
        (void) sigvec(SIGALRM, &ovec, (struct sigvec *)0);
        (void) sigsetmask(omask);
        (void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0);

+       return 0;

 }
 
 static void
 }
 
 static void