X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsettime.c;h=cb91e8b8f3beff246ef2dbeef92f58fd16c106dc;hb=f5e328c1b9481fedbe4134404155b1c89d0aeded;hp=277c805831c76f26f1a1e5152aa6108cf6a4346e;hpb=51907d763eb8f5ecad76c0bc88dabf7e0e528b6b;p=gnulib.git

diff --git a/lib/settime.c b/lib/settime.c
index 277c80583..cb91e8b8f 100644
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -1,10 +1,11 @@
 /* settime -- set the system clock
-   Copyright (C) 2002 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2002, 2004-2007, 2009-2010 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
-   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
@@ -12,27 +13,33 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "timespec.h"
 
+#include <sys/time.h>
+#include <unistd.h>
+
+#include <errno.h>
+
 /* 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
 
+#if HAVE_SETTIMEOFDAY
   {
     struct timeval tv;
 
@@ -40,4 +47,13 @@ settime (struct timespec const *ts)
     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
 }