projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
lib
/
nanosleep.c
diff --git
a/lib/nanosleep.c
b/lib/nanosleep.c
index
62b9f85
..
7a7cc02
100644
(file)
--- a/
lib/nanosleep.c
+++ b/
lib/nanosleep.c
@@
-1,12
+1,12
@@
/* Provide a replacement for the POSIX nanosleep function.
/* Provide a replacement for the POSIX nanosleep function.
- Copyright (C) 1999, 2000, 2002, 2004, 2005, 2006
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2004, 2005, 2006
, 2007, 2008 Fre
e
+
Software
Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,49
+14,35
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* written by Jim Meyering */
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#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 <time.h>
+
+#include "sig-handler.h"
+#include "timespec.h"
#include <stdbool.h>
#include <stdio.h>
#include <stdbool.h>
#include <stdio.h>
-#if HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
#include <sys/types.h>
#include <sys/types.h>
+#include <sys/select.h>
#include <signal.h>
#include <signal.h>
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <sys/time.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
-#
include "timespec.h"
+#
undef nanosleep
enum { BILLION = 1000 * 1000 * 1000 };
#if HAVE_BUG_BIG_NANOSLEEP
enum { BILLION = 1000 * 1000 * 1000 };
#if HAVE_BUG_BIG_NANOSLEEP
-void
+
static
void
getnow (struct timespec *t)
{
# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
getnow (struct timespec *t)
{
# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
@@
-117,10
+103,6
@@
rpl_nanosleep (const struct timespec *requested_delay,
# define SIGCONT SIGTERM
# endif
# define SIGCONT SIGTERM
# endif
-# if ! HAVE_SIGINTERRUPT
-# define siginterrupt(sig, flag) /* empty */
-# endif
-
static sig_atomic_t volatile suspended;
/* Handle SIGCONT. */
static sig_atomic_t volatile suspended;
/* Handle SIGCONT. */
@@
-165,22
+147,18
@@
rpl_nanosleep (const struct timespec *requested_delay,
/* set up sig handler */
if (! 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;
+ struct sigaction oldact;
sigaction (SIGCONT, NULL, &oldact);
sigaction (SIGCONT, NULL, &oldact);
- if (oldact.sa_handler != SIG_IGN)
- sigaction (SIGCONT, &newact, NULL);
-# else
- if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
+ if (get_handler (&oldact) != SIG_IGN)
{
{
- signal (SIGCONT, sighandler);
- siginterrupt (SIGCONT, 1);
+ struct sigaction newact;
+
+ newact.sa_handler = sighandler;
+ sigemptyset (&newact.sa_mask);
+ newact.sa_flags = 0;
+ sigaction (SIGCONT, &newact, NULL);
}
}
-# endif
initialized = true;
}
initialized = true;
}