projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Override <sys/socket.h> when it exists but is incomplete.
[gnulib.git]
/
lib
/
utimens.c
diff --git
a/lib/utimens.c
b/lib/utimens.c
index
e72b840
..
e128219
100644
(file)
--- a/
lib/utimens.c
+++ b/
lib/utimens.c
@@
-1,10
+1,11
@@
/* Set file access and modification times.
/* Set file access and modification times.
- Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+ Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify it
+ 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
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version
2, or (at your option)
any
+ Free Software Foundation; either version
3 of the License, or
any
later version.
This program is distributed in the hope that it will be useful,
later version.
This program is distributed in the hope that it will be useful,
@@
-13,8
+14,7
@@
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 Paul Eggert. */
/* Written by Paul Eggert. */
@@
-26,6
+26,7
@@
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/time.h>
#include <unistd.h>
#if HAVE_UTIME_H
#include <unistd.h>
#if HAVE_UTIME_H
@@
-53,7
+54,7
@@
struct utimbuf
#endif
#ifndef __attribute__
#endif
#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
|| __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
# define __attribute__(x)
# endif
#endif
# define __attribute__(x)
# endif
#endif
@@
-73,8
+74,8
@@
struct utimbuf
Return 0 on success, -1 (setting errno) on failure. */
int
Return 0 on success, -1 (setting errno) on failure. */
int
-futimens (int fd ATTRIBUTE_UNUSED,
- char const *file, struct timespec const timespec[2])
+
gl_
futimens (int fd ATTRIBUTE_UNUSED,
+
char const *file, struct timespec const timespec[2])
{
/* Some Linux-based NFS clients are buggy, and mishandle time stamps
of files in NFS file systems in some cases. We have no
{
/* Some Linux-based NFS clients are buggy, and mishandle time stamps
of files in NFS file systems in some cases. We have no
@@
-87,10
+88,10
@@
futimens (int fd ATTRIBUTE_UNUSED,
problem affects many applications. */
#if HAVE_BUGGY_NFS_TIME_STAMPS
problem affects many applications. */
#if HAVE_BUGGY_NFS_TIME_STAMPS
- if (0 <= fd)
- fsync (fd);
- else
+ if (fd < 0)
sync ();
sync ();
+ else
+ fsync (fd);
#endif
/* There's currently no interface to set file timestamps with
#endif
/* There's currently no interface to set file timestamps with
@@
-183,5
+184,5
@@
futimens (int fd ATTRIBUTE_UNUSED,
int
utimens (char const *file, struct timespec const timespec[2])
{
int
utimens (char const *file, struct timespec const timespec[2])
{
- return futimens (-1, file, timespec);
+ return
gl_
futimens (-1, file, timespec);
}
}