projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Treat __strftime__ and __strfmon__ like __scanf__.
[gnulib.git]
/
lib
/
settime.c
diff --git
a/lib/settime.c
b/lib/settime.c
index
277c805
..
25e7e68
100644
(file)
--- a/
lib/settime.c
+++ b/
lib/settime.c
@@
-1,5
+1,7
@@
/* settime -- set the system clock
/* settime -- set the system clock
- Copyright (C) 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 2002, 2004, 2005, 2006, 2007 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
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,26
+15,43
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "timespec.h"
#include "timespec.h"
+#include <sys/time.h>
+#include <unistd.h>
+
+#include <errno.h>
+
+/* Some systems don't have ENOSYS. */
+#ifndef ENOSYS
+# ifdef ENOTSUP
+# define ENOSYS ENOTSUP
+# else
+/* Some systems don't have ENOTSUP either. */
+# define ENOSYS EINVAL
+# endif
+#endif
+
/* Set the system time. */
int
settime (struct timespec const *ts)
{
#if defined CLOCK_REALTIME && HAVE_CLOCK_SETTIME
/* Set the system time. */
int
settime (struct timespec const *ts)
{
#if defined CLOCK_REALTIME && HAVE_CLOCK_SETTIME
- if (clock_settime (CLOCK_REALTIME, ts) == 0)
- return 0;
+ {
+ int r = clock_settime (CLOCK_REALTIME, ts);
+ if (r == 0 || errno == EPERM)
+ return r;
+ }
#endif
#endif
+#if HAVE_SETTIMEOFDAY
{
struct timeval tv;
{
struct timeval tv;
@@
-40,4
+59,13
@@
settime (struct timespec const *ts)
tv.tv_usec = ts->tv_nsec / 1000;
return settimeofday (&tv, 0);
}
tv.tv_usec = ts->tv_nsec / 1000;
return settimeofday (&tv, 0);
}
+#elif HAVE_STIME
+ /* This fails to compile on OSF1 V5.1, due to stime requiring
+ a `long int*' and tv_sec is `int'. But that system does provide
+ settimeofday. */
+ return stime (&ts->tv_sec);
+#else
+ errno = ENOSYS;
+ return -1;
+#endif
}
}