From 82ab5bbac5d115b7cae4f3ca28f3ba8cce9431ba Mon Sep 17 00:00:00 2001 From: Flávio Cruz Date: Mon, 5 Mar 2018 02:58:41 +0100 Subject: Add file_utimens RPC to use a struct timespec and update the servers to use UTIME_NOW and UTIME_OMIT. * console-client/trans.c (netfs_attempt_utimes): Do not set current time ourself. * console/console.c (netfs_attempt_utimes): Likewise. * ftpfs/netfs.c (netfs_attempt_utimes): Likewise. * hostmux/node.c (netfs_attempt_utimes): Likewise. * usermux/node.c (netfs_attempt_utimes): Likewise. * nfs/ops.c (netfs_attempt_utimes): Likewise. * doc/hurd.texi (file_utimens): Add documentation. * hurd/fs.defs (file_utimens): Add RPC. * libdiskfs/file-utimes.c (diskfs_S_file_utimes): Move implementation and replace with translation layer with... (diskfs_S_file_utimens): ... new function. * libnetfs/file-utimes.c (netfs_S_file_utimes): Likewise with... (netfs_S_file_utimens): ... new function. * libnetfs/init-init.c: Include . (netfs_mtime): New variable. (netfs_init): New function. * libnetfs/netfs.h (netfs_attempt_utimes): Update documentation. * libnetfs/priv.h (netfs_mtime): Declare variable. * libtreefs/s-file.c (treefs_S_file_utimes): Convert time values and call treefs_s_file_utimens instead of treefs_s_file_utimes. * libtreefs/treefs-hooks.h: Replace TREEFS_HOOK_S_FILE_UTIMES with TREEFS_HOOK_S_FILE_UTIMENS. * libtreefs/treefs-s-hooks.h: Replace s_file_utimes with s_file_utimens. * libtrivfs/file-utimes.c (trivfs_S_file_utimens): New function. * libtrivfs/times.c (trivfs_set_atime): Try to use file_utimens before using file_utimes. (trivfs_set_mtime): Likewise. * nfsd/ops.c (complete_setattr): Likewise. * trans/fakeroot.c (netfs_attempt_utimes): Likewise. * nfs/nfs.c (xdr_encode_sattr_times): Do not set atime or mtime when they are NULL. * configure.ac: Look for file_futimens, and define UTIME_NOW/OMIT, for compatibility with old glibcs. --- libtrivfs/file-utimes.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'libtrivfs/file-utimes.c') diff --git a/libtrivfs/file-utimes.c b/libtrivfs/file-utimes.c index 827c0554..7c5eaf43 100644 --- a/libtrivfs/file-utimes.c +++ b/libtrivfs/file-utimes.c @@ -25,3 +25,37 @@ trivfs_S_file_utimes (struct trivfs_protid *cred, { return cred ? file_utimes (cred->realnode, atime, mtime) : EOPNOTSUPP; } + +kern_return_t +trivfs_S_file_utimens (struct trivfs_protid *cred, + mach_port_t reply, mach_msg_type_name_t reply_type, + struct timespec atime, struct timespec mtime) +{ + kern_return_t err; + + if (!cred) + return EOPNOTSUPP; + +#ifdef HAVE_FILE_UTIMENS + err = file_utimens (cred->realnode, atime, mtime); + + if (err == EMIG_BAD_ID || err == EOPNOTSUPP) +#endif + { + time_value_t atim, mtim; + + if (atime.tv_nsec == UTIME_NOW) + atim.microseconds = -1; + else + TIMESPEC_TO_TIME_VALUE (&atim, &atime); + + if (mtime.tv_nsec == UTIME_NOW) + mtim.microseconds = -1; + else + TIMESPEC_TO_TIME_VALUE (&mtim, &mtime); + + err = file_utimes (cred->realnode, atim, mtim); + } + + return err; +} -- cgit v1.2.3