Fix merge conflicts

[bsdgames-darwin.git] / larn / nap.c

diff --git a/larn/nap.c b/larn/nap.c
index 732974d2bc2f4d6ca0524b6b8d47594c3813ebc6..1bd11ea676b2936b515169f315488f210c08aa0f 100644 (file)
--- a/larn/nap.c
+++ b/larn/nap.c
@@ -1,120 +1,23 @@
-#ifndef lint
-static char rcsid[] = "$Id: nap.c,v 1.2 1993/08/02 17:20:15 mycroft Exp $";
-#endif /* not lint */
+/*     $NetBSD: nap.c,v 1.6 2012/06/19 05:30:43 dholland Exp $ */
 
 /* nap.c                Larn is copyrighted 1986 by Noah Morgan. */
-#include <signal.h>
-#include <sys/types.h>
-#ifdef SYSV
-#include <sys/times.h>
-#else
-#ifdef BSD
-#include <sys/timeb.h>
-#endif BSD
-#endif SYSV
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: nap.c,v 1.6 2012/06/19 05:30:43 dholland Exp $");
+#endif                         /* not lint */
+
+#include <unistd.h>
+#include "header.h"
+#include "extern.h"
 
 /*
  *     routine to take a nap for n milliseconds
  */
-nap(x)
-       register int x;
-       {
-       if (x<=0) return; /* eliminate chance for infinite loop */
+void
+nap(int x)
+{
+       if (x <= 0)
+               return;         /* eliminate chance for infinite loop */
        lflush();
-       if (x > 999) sleep(x/1000); else napms(x);
-       }
-
-#ifdef NONAP
-napms(x)       /* do nothing */
-       int x;
-       {
-       }
-#else NONAP
-#ifdef SYSV
-/*     napms - sleep for time milliseconds - uses times() */
-/* this assumes that times returns a relative time in 60ths of a second */
-/* this will do horrible things if your times() returns seconds! */
-napms(time)
-       int time;
-       {
-       long matchclock, times();
-       struct tms stats;
-
-       if (time<=0) time=1; /* eliminate chance for infinite loop */
-       if ((matchclock = times(&stats)) == -1 || matchclock == 0)
-               return; /* error, or BSD style times() */
-       matchclock += (time / 17);              /*17 ms/tic is 1000 ms/sec / 60 tics/sec */
-
-       while(matchclock < times(&stats))
-               ;
-       }
-
-#else not SYSV
-#ifdef BSD
-#ifdef SIGVTALRM
-/* This must be BSD 4.2!  */
-#include <sys/time.h>
-#define bit(_a) (1<<((_a)-1))
-
-static  nullf()
-    {
-    }
-
-/*     napms - sleep for time milliseconds - uses setitimer() */
-napms(time)
-       int time;
-    {
-    struct itimerval    timeout;
-    int     (*oldhandler) ();
-    int     oldsig;
-
-       if (time <= 0) return;
-
-    timerclear(&timeout.it_interval);
-    timeout.it_value.tv_sec = time / 1000;
-    timeout.it_value.tv_usec = (time % 1000) * 1000;
-
-    oldsig = sigblock(bit(SIGALRM));
-    setitimer(ITIMER_REAL, &timeout, (struct itimerval *)0);
-    oldhandler = signal(SIGALRM, nullf);
-    sigpause(oldsig);
-    signal(SIGALRM, oldhandler);
-    sigsetmask(oldsig);
-    }
-
-#else
-/*     napms - sleep for time milliseconds - uses ftime() */
-
-static napms(time)
-       int time;
-       {
-       /* assumed to be BSD UNIX */
-       struct timeb _gtime;
-       time_t matchtime;
-       unsigned short matchmilli;
-       register struct timeb *tp = & _gtime;
-
-       if (time <= 0) return;
-       ftime(tp);
-       matchmilli = tp->millitm + time;
-       matchtime  = tp->time;
-       while (matchmilli >= 1000)
-               {
-               ++matchtime;
-               matchmilli -= 1000;
-               }
-
-       while(1)
-               {
-               ftime(tp);
-               if ((tp->time > matchtime) ||
-                       ((tp->time == matchtime) && (tp->millitm >= matchmilli)))
-                       break;
-               }
-       }
-#endif
-#else not BSD
-static napms(time) int time; {}        /* do nothing, forget it */
-#endif BSD
-#endif SYSV
-#endif NONAP
+       usleep(x * 1000);
+}