X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fnanosleep.c;h=fa2078507287e3806dd85dbdbdebfc226fff22c3;hb=5fa5d3d767b29cf1d757609afbb56459b09743fa;hp=c5451ffc4f5992d4089751f192b7e70b4065bb56;hpb=c6beac9fc4202f59840b4b1e774ff803b43ec044;p=gnulib.git

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index c5451ffc4..fa2078507 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -1,5 +1,5 @@
 /* Provide a replacement for the POSIX nanosleep function.
-   Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2004, 2005 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
@@ -13,29 +13,31 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 /* 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 <stdbool.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
+#include "timespec.h"
+
 /* Some systems (MSDOS) don't have SIGCONT.
    Using SIGTERM here turns the signal-handling code below
    into a no-op on such systems. */
@@ -43,7 +45,9 @@ extern int errno;
 # define SIGCONT SIGTERM
 #endif
 
-#include "timespec.h"
+#if ! HAVE_SIGINTERRUPT
+# define siginterrupt(sig, flag) /* empty */
+#endif
 
 static sig_atomic_t volatile suspended;
 
@@ -68,7 +72,7 @@ my_usleep (const struct timespec *ts_delay)
       tv_delay.tv_sec++;
       tv_delay.tv_usec = 0;
     }
-  select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay);
+  select (0, NULL, NULL, NULL, &tv_delay);
 }
 
 /* FIXME: comment */
@@ -77,18 +81,13 @@ int
 rpl_nanosleep (const struct timespec *requested_delay,
 	       struct timespec *remaining_delay)
 {
-  static int initialized;
-
-#ifdef SA_NOCLDSTOP
-  struct sigaction oldact, newact;
-#endif
-
-  suspended = 0;
+  static bool initialized;
 
   /* set up sig handler */
   if (! initialized)
     {
 #ifdef SA_NOCLDSTOP
+      struct sigaction oldact, newact;
       newact.sa_handler = sighandler;
       sigemptyset (&newact.sa_mask);
       newact.sa_flags = 0;
@@ -98,11 +97,16 @@ rpl_nanosleep (const struct timespec *requested_delay,
 	sigaction (SIGCONT, &newact, NULL);
 #else
       if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
-	signal (SIGCONT, sighandler);
+	{
+	  signal (SIGCONT, sighandler);
+	  siginterrupt (SIGCONT, 1);
+	}
 #endif
-      initialized = 1;
+      initialized = true;
     }
 
+  suspended = 0;
+
   my_usleep (requested_delay);
 
   if (suspended)