Merge branch 'master' into vpcvpc

1 files changed, 25 insertions, 3 deletions

diff --git a/usr/src/lib/libc/port/sys/utimesys.c b/usr/src/lib/libc/port/sys/utimesys.c
index dc917f27ae..55e53dbb53 100644
--- a/usr/src/lib/libc/port/sys/utimesys.c
+++ b/usr/src/lib/libc/port/sys/utimesys.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+ */
+
 #include "lint.h"
 #include <string.h>
 #include <utime.h>
@@ -67,8 +71,8 @@ utime(const char *path, const struct utimbuf *times)
 	return (utimensat(AT_FDCWD, path, tsp, 0));
 }
 
-int
-utimes(const char *path, const struct timeval times[2])
+static int
+utimes_impl(const char *path, const struct timeval times[2], int flag)
 {
 	struct timeval ltimes[2];
 	timespec_t ts[2];
@@ -86,7 +90,19 @@ utimes(const char *path, const struct timeval times[2])
 		ts[1].tv_nsec = ltimes[1].tv_usec * 1000;
 		tsp = ts;
 	}
-	return (utimensat(AT_FDCWD, path, tsp, 0));
+	return (utimensat(AT_FDCWD, path, tsp, flag));
+}
+
+int
+utimes(const char *path, const struct timeval times[2])
+{
+	return (utimes_impl(path, times, 0));
+}
+
+int
+lutimes(const char *path, const struct timeval times[2])
+{
+	return (utimes_impl(path, times, AT_SYMLINK_NOFOLLOW));
 }
 
 #pragma weak _futimesat = futimesat
@@ -115,3 +131,9 @@ futimesat(int fd, const char *path, const struct timeval times[2])
 
 	return (utimensat(fd, path, tsp, 0));
 }
+
+int
+futimes(int fd, const struct timeval times[2])
+{
+	return (futimesat(fd, NULL, times));
+}