From 20acbc25428bb7c9a78de37236285a09108da313 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 27 Aug 2002 02:10:01 +0000 Subject: * time/sys/time.h [__USE_BSD] (lutimes, futimes): Declare them. * manual/filesys.texi (File Times): Document lutimes and futimes. * misc/Makefile (routines): Add them. * misc/Versions (libc: GLIBC_2.3): Likewise. * sysdeps/generic/lutimes.c: New file. * sysdeps/generic/futimes.c: New file. * sysdeps/mach/hurd/lutimes.c: New file. * sysdeps/mach/hurd/futimes.c: New file. * manual/filesys.texi (File Times): Add explicit note about null pointer argument to utimes. 2002-08-26 Roland McGrath * sysdeps/mach/hurd/ifreq.h (__if_freereq): Add missing semicolon. (__ifreq): Add a cast. Remove an unused variable. * hurd/hurd/threadvar.h (enum __hurd_threadvar_index): Add _HURD_THREADVAR_LOCALE. --- sysdeps/mach/hurd/futimes.c | 47 ++++++++++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/ifreq.h | 5 ++--- sysdeps/mach/hurd/lutimes.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 sysdeps/mach/hurd/futimes.c create mode 100644 sysdeps/mach/hurd/lutimes.c (limited to 'sysdeps/mach/hurd') diff --git a/sysdeps/mach/hurd/futimes.c b/sysdeps/mach/hurd/futimes.c new file mode 100644 index 0000000000..ca687b8bdf --- /dev/null +++ b/sysdeps/mach/hurd/futimes.c @@ -0,0 +1,47 @@ +/* futimes -- change access and modification times of open file. Hurd version. + Copyright (C) 2002 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 FD to TVP[0] and + the modification time of FD to TVP[1]. */ +int +__futimes (int fd, const struct timeval tvp[2]) +{ + struct timeval timevals[2]; + error_t err; + + if (tvp == NULL) + { + /* Setting the number of microseconds to `-1' tells the + underlying filesystems to use the current time. */ + timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1; + tvp = timevals; + } + + err = HURD_DPORT_USE (fd, __file_utimes (port, + *(time_value_t *) &tvp[0], + *(time_value_t *) &tvp[1])); + return err ? __hurd_dfail (fd, err) : 0; +} +weak_alias (__futimes, futimes) diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.h index 737dee9285..f2143d8c70 100644 --- a/sysdeps/mach/hurd/ifreq.h +++ b/sysdeps/mach/hurd/ifreq.h @@ -27,7 +27,6 @@ static inline void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) { - struct ifconf ifc; file_t server; server = _hurd_socket_server (PF_INET, 0); @@ -49,7 +48,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) server = _hurd_socket_server (PF_INET, 1); if (server == MACH_PORT_NULL) goto out; - err = __pfinet_siocgifconf (server, -1, ifreqs, &len); + err = __pfinet_siocgifconf (server, -1, (data_t *) ifreqs, &len); } if (err) goto out; @@ -70,5 +69,5 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) static inline void __if_freereq (struct ifreq *ifreqs, int num_ifs) { - munmap (ifreqs, num_ifs * sizeof (struct ifreq)) + __munmap (ifreqs, num_ifs * sizeof (struct ifreq)); } diff --git a/sysdeps/mach/hurd/lutimes.c b/sysdeps/mach/hurd/lutimes.c new file mode 100644 index 0000000000..cf89d8862f --- /dev/null +++ b/sysdeps/mach/hurd/lutimes.c @@ -0,0 +1,53 @@ +/* lutimes -- change access and modification times of a symlink. Hurd version. + Copyright (C) 2002 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]. */ +int +__lutimes (const char *file, const struct timeval tvp[2]) +{ + struct timeval timevals[2]; + error_t err; + file_t port; + + if (tvp == NULL) + { + /* Setting the number of microseconds to `-1' tells the + underlying filesystems to use the current time. */ + timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1; + tvp = timevals; + } + + port = __file_name_lookup (file, O_NOLINK, 0); + if (port == MACH_PORT_NULL) + return -1; + err = __file_utimes (port, + *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]); + __mach_port_deallocate (__mach_task_self (), port); + if (err) + return __hurd_fail (err); + return 0; +} +weak_alias (__lutimes, lutimes) -- cgit 1.4.1