X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fnanosleep.c;h=4cfe21b57b7b4e67662e65d5c0df0bc9b91c1e3a;hb=269accf808a245264aa79c30adbdee7dfa952451;hp=b833c01f4aaeffd3193c0edc58d837e4d127e3d2;hpb=c3a36c262d8af12176ebd5f10dc6f7ff9a743f97;p=gnulib.git

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index b833c01f4..4cfe21b57 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -1,5 +1,5 @@
 /* Provide a replacement for the POSIX nanosleep function.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,44 +19,89 @@
 
 #include <config.h>
 
+/* Undefine nanosleep here so any prototype is not redefined to be a
+   prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2)  */
+#undef nanosleep
+
+#include <stdio.h>
 #include <sys/types.h>
+#include <signal.h>
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
 
-#include <time.h>
-/* FIXME: is including both like this kosher?  */
-#include <sys/time.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
-static interrupted;
+#include "nanosleep.h"
 
-/* Sleep for USEC microseconds. */
+static int suspended;
+int first_call = 1;
+
+/* Handle SIGCONT. */
 
 static void
-usleep (const struct timespec *ts_delay)
+sighandler (int sig)
+{
+  suspended = 1;
+}
+
+/* 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;
-  select (0, (void *) 0, (void *) 0, (void *) 0, tv_delay);
+  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)
+rpl_nanosleep (const struct timespec *requested_delay,
+	       struct timespec *remaining_delay)
 {
-  interrupted = 0;
+#ifdef SA_NOCLDSTOP
+  struct sigaction oldact, newact;
+#endif
+
+  suspended = 0;
 
-  /* set up sig handler -- but maybe only do this the first time?  */
-  /* FIXME */
+  /* set up sig handler */
+  if (first_call)
+    {
+#ifdef SA_NOCLDSTOP
+      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);
+#else
+      if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
+	signal (SIGCONT, sighandler);
+#endif
+      first_call = 0;
+    }
 
-  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
 	 rush to implement it.  */
+
+      errno = EINTR;
     }
 
   /* FIXME: Restore sig handler?  */
 
-  return interrupted;
+  return suspended;
 }