Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

diff --git a/source3/configure.in b/source3/configure.in
index 87707a2f7f7c9580f508c85d736da3a4ef285fba..3ae2c8c9d37350bd8dcd33e6289a38bbe74ddba8 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1474,6 +1474,46 @@ if test x"$samba_cv_stat_hires_notimespec_n" = x"yes" ; then
            [whether struct stat has sub-second timestamps without struct timespec suffixed _n])
 fi
 
+dnl Tru64 has _micro_second_ resolution:
+AC_CACHE_CHECK([whether struct stat has sub-second timestamps in st_uXtime], samba_cv_stat_hires_uxtime,
+    [
+       AC_TRY_COMPILE(
+           [
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+           ],
+           [
+               struct timespec t;
+               struct stat s = {0};
+               t.tv_sec = s.st_mtime;
+               t.tv_nsec = s.st_umtime * 1000;
+               t.tv_sec = s.st_ctime;
+               t.tv_nsec = s.st_uctime * 1000;
+               t.tv_sec = s.st_atime;
+               t.tv_nsec = s.st_uatime * 1000;
+           ],
+           samba_cv_stat_hires_uxtime=yes, samba_cv_stat_hires_uxtime=no)
+    ])
+
+if test x"$samba_cv_stat_hires_uxtime" = x"yes" ; then
+    AC_DEFINE(HAVE_STAT_ST_UMTIME, 1, [whether struct stat contains st_umtime])
+    AC_DEFINE(HAVE_STAT_ST_UATIME, 1, [whether struct stat contains st_uatime])
+    AC_DEFINE(HAVE_STAT_ST_UCTIME, 1, [whether struct stat contains st_uctime])
+    AC_DEFINE(HAVE_STAT_HIRES_TIMESTAMPS, 1,
+           [whether struct stat has sub-second timestamps in st_uXtime])
+fi
+
 AC_CACHE_CHECK([whether struct stat has st_birthtimespec], samba_cv_stat_st_birthtimespec,
     [
        AC_TRY_COMPILE(

diff --git a/source3/lib/time.c b/source3/lib/time.c
index 682d96c7dbf60493b701cf493fc984a87fca80f2..e2cfe687b2f07c58077274e087b6352be947fda4 100644 (file)
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -409,6 +409,11 @@ struct timespec get_atimespec(const SMB_STRUCT_STAT *pst)
        ret.tv_sec = pst->st_atime;
        ret.tv_nsec = pst->st_atime_n;
        return ret;
+#elif defined(HAVE_STAT_ST_UATIME)
+       struct timespec ret;
+       ret.tv_sec = pst->st_atime;
+       ret.tv_nsec = pst->st_uatime * 1000;
+       return ret;
 #elif defined(HAVE_STAT_ST_ATIMESPEC)
        return pst->st_atimespec;
 #else
@@ -431,6 +436,9 @@ void set_atimespec(SMB_STRUCT_STAT *pst, struct timespec ts)
 #elif defined(HAVE_STAT_ST_ATIME_N)
        pst->st_atime = ts.tv_sec;
        pst->st_atime_n = ts.tv_nsec;
+#elif defined(HAVE_STAT_ST_UATIME)
+       pst->st_atime = ts.tv_sec;
+       pst->st_uatime = ts.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_ATIMESPEC)
        pst->st_atimespec = ts;
 #else
@@ -461,6 +469,11 @@ struct timespec get_mtimespec(const SMB_STRUCT_STAT *pst)
        ret.tv_sec = pst->st_mtime;
        ret.tv_nsec = pst->st_mtime_n;
        return ret;
+#elif defined(HAVE_STAT_ST_UMTIME)
+       struct timespec ret;
+       ret.tv_sec = pst->st_mtime;
+       ret.tv_nsec = pst->st_umtime * 1000;
+       return ret;
 #elif defined(HAVE_STAT_ST_MTIMESPEC)
        return pst->st_mtimespec;
 #else
@@ -483,6 +496,9 @@ void set_mtimespec(SMB_STRUCT_STAT *pst, struct timespec ts)
 #elif defined(HAVE_STAT_ST_MTIME_N)
        pst->st_mtime = ts.tv_sec;
        pst->st_mtime_n = ts.tv_nsec;
+#elif defined(HAVE_STAT_ST_UMTIME)
+       pst->st_mtime = ts.tv_sec;
+       pst->st_umtime = ts.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_MTIMESPEC)
        pst->st_mtimespec = ts;
 #else
@@ -513,6 +529,11 @@ struct timespec get_ctimespec(const SMB_STRUCT_STAT *pst)
        ret.tv_sec = pst->st_ctime;
        ret.tv_nsec = pst->st_ctime_n;
        return ret;
+#elif defined(HAVE_STAT_ST_UCTIME)
+       struct timespec ret;
+       ret.tv_sec = pst->st_ctime;
+       ret.tv_nsec = pst->st_uctime * 1000;
+       return ret;
 #elif defined(HAVE_STAT_ST_CTIMESPEC)
        return pst->st_ctimespec;
 #else
@@ -535,6 +556,9 @@ void set_ctimespec(SMB_STRUCT_STAT *pst, struct timespec ts)
 #elif defined(HAVE_STAT_ST_CTIME_N)
        pst->st_ctime = ts.tv_sec;
        pst->st_ctime_n = ts.tv_nsec;
+#elif defined(HAVE_STAT_ST_UCTIME)
+       pst->st_ctime = ts.tv_sec;
+       pst->st_uctime = ts.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_CTIMESPEC)
        pst->st_ctimespec = ts;
 #else