From 4d1979423e6f73954ca594197634fde563ef80f5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 15 Jul 2008 15:26:36 -0700 Subject: Fix from Volodymyr Khomenko . Make ntimes function more like POSIX and allow NULL arg. Help vfs developers. Jeremy. (This used to be commit 613f2849ad2dc25fe2e5f8a76d69797b5b302bb9) --- source3/modules/vfs_default.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 6ee677e376..381aa18561 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -657,18 +657,22 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, const char *path, const str START_PROFILE(syscall_ntimes); #if defined(HAVE_UTIMES) - { + if (ts != NULL) { struct timeval tv[2]; tv[0] = convert_timespec_to_timeval(ts[0]); tv[1] = convert_timespec_to_timeval(ts[1]); result = utimes(path, tv); + } else { + result = utimes(path, NULL); } #elif defined(HAVE_UTIME) - { + if (ts != NULL) { struct utimbuf times; times.actime = convert_timespec_to_time_t(ts[0]); times.modtime = convert_timespec_to_time_t(ts[1]); result = utime(path, times); + } else { + result = utime(path, NULL); } #else errno = ENOSYS; -- cgit