From 82bae9f921065377c6fbf08edf4929b1db92a0d5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 12 Jul 2003 08:23:50 +0000 Subject: [PATCH] Update. 2003-07-12 Ulrich Drepper * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_UTIMES for the architectures which always had the syscall. * sysdeps/unix/sysv/linux/futimes.c: New file. --- ChangeLog | 6 ++++ sysdeps/unix/sysv/linux/futimes.c | 60 +++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/kernel-features.h | 6 ++++ 3 files changed, 72 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/futimes.c diff --git a/ChangeLog b/ChangeLog index 6798453..c0a2a15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-07-12 Ulrich Drepper + + * sysdeps/unix/sysv/linux/kernel-features.h: Define + __ASSUME_UTIMES for the architectures which always had the syscall. + * sysdeps/unix/sysv/linux/futimes.c: New file. + 2003-07-12 Kaz Kojima * sysdeps/unix/sysv/linux/sh/socket.S: Save and restore the PR diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c new file mode 100644 index 0000000..a10ebab --- /dev/null +++ b/sysdeps/unix/sysv/linux/futimes.c @@ -0,0 +1,60 @@ +/* futimes -- change access and modification times of open file. Stub version. + Copyright (C) 2002, 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 +#include +#include +#include +#include + +/* Change the access time of FILE to TVP[0] and + the modification time of FILE to TVP[1], but do not follow symlinks. + + The Linux kernel has no futimes() syscall so we use the /proc + filesystem. */ +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); + cp = memcpy (cp - sizeof (selffd) + 1, selffd, sizeof (selffd) - 1); + +#ifdef __NR_utimes + int result = INLINE_SYSCALL (utimes, 2, cp, 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 ut = + { + .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); +#endif +} +weak_alias (__futimes, futimes) diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 4d19238..cb1d04a 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -345,3 +345,9 @@ #if __LINUX_KERNEL_VERSION >= 132427 && defined __i386__ # define __ASSUME_TGKILL 1 #endif + +/* The utimes syscall has been available for some architectures forever. */ +#if defined __alpha__ || defined __ia64__ || defined __hppa_ \ + || defined __sparc__ +# define __ASSUME_UTIMES 1 +#endif -- 2.7.4