diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/futimes.c | 25 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/utimes.c | 59 |
4 files changed, 96 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 2f4966397f..2077de0468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2003-07-12 Ulrich Drepper <drepper@redhat.com> + * 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> + * time/sys/time.h: Namespace cleanup. * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_UTIMES for the architectures which always had the syscall. 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) diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index cb1d04ad93..3dba1de24f 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -346,8 +346,10 @@ # define __ASSUME_TGKILL 1 #endif -/* The utimes syscall has been available for some architectures forever. */ -#if defined __alpha__ || defined __ia64__ || defined __hppa_ \ - || defined __sparc__ +/* The utimes syscall has been available for some architectures + forever. For x86 it was introduced after 2.5.75. */ +#if defined __alpha__ || defined __ia64__ || defined __hppa__ \ + || defined __sparc__ \ + || (__LINUX_KERNEL_VERSION > 132427 && defined __i386__) # define __ASSUME_UTIMES 1 #endif diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c new file mode 100644 index 0000000000..57b82f9237 --- /dev/null +++ b/sysdeps/unix/sysv/linux/utimes.c @@ -0,0 +1,59 @@ +/* Copyright (C) 1995, 1997, 2000, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <errno.h> +#include <stddef.h> +#include <utime.h> +#include <sys/time.h> +#include "kernel-features.h" + + +/* Change the access time of FILE to TVP[0] and + the modification time of FILE to TVP[1]. */ +int +__utimes (const char *file, const struct timeval tvp[2]) +{ +#ifdef __NR_utimes + int result = INLINE_SYSCALL (utimes, 2, file, tvp); +# ifndef __ASSUME_UTIMES + if (result != -1 || errno != ENOSYS) +# endif + return result; +#endif + + /* The utimes() syscall does not exist or is not available in the + used kernel. Use utime(). For this we have to convert to the + data format utime() expects. */ +#ifndef __ASSUME_UTIMES + struct utimbuf buf; + struct utimbuf *times; + + if (tvp != NULL) + { + 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, file, times); +#endif +} + +weak_alias (__utimes, utimes) |