Update.

	* sysdeps/unix/sysv/linux/kernel-features.h: Define
	__ASSUME_UTIMES for x86 and kernels > 2.5.75.

	* sysdeps/unix/sysv/linux/futimes.c (__futimes): Handle case with
	second parameter == NULL.
	* sysdeps/unix/sysv/linux/utimes.c: New file.

2003-07-12  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/futimes.c: Include kernel-features.h.
	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_UTIMES): Fix
	a typo.

2003-07-12  Ulrich Drepper  <drepper@redhat.com>

1 files changed, 17 insertions, 8 deletions

diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c
index a10ebabf98..bb1f045df5 100644
--- a/sysdeps/unix/sysv/linux/futimes.c
+++ b/sysdeps/unix/sysv/linux/futimes.c
@@ -23,6 +23,8 @@
 #include <sys/time.h>
 #include <stdio-common/_itoa.h>
 
+#include "kernel-features.h"
+
 /* Change the access time of FILE to TVP[0] and
    the modification time of FILE to TVP[1], but do not follow symlinks.
 
@@ -32,9 +34,9 @@ int
 __futimes (int fd, const struct timeval tvp[2])
 {
   static const char selffd[] = "/proc/self/fd/";
-  char buf[sizeof (selffd) + 3 * sizeof (int)];
-  buf[sizeof (buf) - 1] = '\0';
-  char *cp = _itoa_word (fd, buf + sizeof (buf) - 1, 10, 0);
+  char fname[sizeof (selffd) + 3 * sizeof (int)];
+  fname[sizeof (fname) - 1] = '\0';
+  char *cp = _itoa_word (fd, fname + sizeof (fname) - 1, 10, 0);
   cp = memcpy (cp - sizeof (selffd) + 1, selffd, sizeof (selffd) - 1);
 
 #ifdef __NR_utimes
@@ -49,12 +51,19 @@ __futimes (int fd, const struct timeval tvp[2])
      used kernel.  Use utime().  For this we have to convert to the
      data format utime() expects.  */
 #ifndef __ASSUME_UTIMES
-  struct utimbuf ut =
+  struct utimbuf buf;
+  struct utimbuf *times;
+
+  if (tvp != NULL)
     {
-      .actime = tvp[0].tv_sec + tvp[0].tv_usec >= 500000,
-      .modtime = tvp[1].tv_sec + tvp[1].tv_usec >= 500000
-    };
-  return INLINE_SYSCALL (utime, 2, cp, &ut);
+      times = &buf;
+      buf.actime = tvp[0].tv_sec + tvp[0].tv_usec >= 500000;
+      buf.modtime = tvp[1].tv_sec + tvp[1].tv_usec >= 500000;
+    }
+  else
+    times = NULL;
+
+  return INLINE_SYSCALL (utime, 2, cp, times);
 #endif
 }
 weak_alias (__futimes, futimes)