Merge branch '4542_nanoseconds_2'

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>

Author: zyv

autogen.sh

@@ -2,7 +2,9 @@
 
 set -e
 
-srcdir="$(cd "$(dirname "$0")" && pwd)"
+# Use backticks to support ksh on Solaris
+basedir=`dirname "$0"`
+srcdir=`cd "$basedir" && pwd`
 
 cd "$srcdir"
 

configure.ac

@@ -36,6 +36,10 @@ dnl ############################################################################
 dnl Check for compiler
 dnl ############################################################################
 
+dnl This should be checked before toolchain macros, otherwise they will remember
+dnl that ar cannot be found and linking via libtool will fail at a later stage
+AC_CHECK_TOOLS([AR], [ar gar])
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 
@@ -211,8 +215,7 @@ dnl ############################################################################
 dnl Check for other tools
 dnl ############################################################################
 
-AC_CHECK_TOOL(AR, ar, ar)
-AC_CHECK_TOOL(INDENT, gindent, indent)
+AC_CHECK_TOOLS([INDENT], [gindent indent])
 mc_UNIT_TESTS
 
 
@@ -261,7 +264,7 @@ AC_CHECK_TYPE([major_t], [], [AC_DEFINE([major_t], [int], [Type of major device
 AC_CHECK_TYPE([minor_t], [], [AC_DEFINE([minor_t], [int], [Type of minor device numbers.])])
 
 AC_STRUCT_ST_BLOCKS
-AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev, struct stat.st_mtim])
+AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev, struct stat.st_mtim, struct stat.st_mtimespec, struct stat.st_mtimensec])
 gl_STAT_SIZE
 
 AH_TEMPLATE([sig_atomic_t],
@@ -387,14 +390,7 @@ AC_EGREP_CPP([yes],
     ])
 
 dnl utimensat is supported since glibc 2.6 and specified in POSIX.1-2008
-dnl utimensat() causes different timespec structures to cause failures on IBM i and AIX
-case $host_os in
-*os400 | aix*)
-    ;;
-*)
-    AC_CHECK_FUNCS([utimensat])
-    ;;
-esac
+AC_CHECK_FUNCS([utimensat])
 
 case $host_os in
 *os400)

lib/unixcompat.h

@@ -113,13 +113,6 @@
 #define get_default_editor() "vi"
 #define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
 
-/* struct stat members */
-#ifdef __APPLE__
-#define st_atim st_atimespec
-#define st_ctim st_ctimespec
-#define st_mtim st_mtimespec
-#endif
-
 /*** enums ***************************************************************************************/
 
 /*** structures declarations (and typedefs of structures)*****************************************/

lib/vfs/direntry.c

@@ -1030,10 +1030,7 @@ vfs_s_default_stat (struct vfs_class *me, mode_t mode)
 #endif
     st.st_size = 0;
 
-    st.st_mtime = st.st_atime = st.st_ctime = time (NULL);
-#ifdef HAVE_STRUCT_STAT_ST_MTIM
-    st.st_atim.tv_nsec = st.st_mtim.tv_nsec = st.st_ctim.tv_nsec = 0;
-#endif
+    vfs_zero_stat_times (&st);
 
     vfs_adjust_stat (&st);
 

lib/vfs/parse_ls_vga.c

@@ -796,15 +796,14 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam
 #endif
     }
 
+    vfs_zero_stat_times (s);
+
     idx = vfs_parse_filedate (idx, &s->st_mtime);
     if (idx == 0)
         goto error;
 
     /* Use resulting time value */
     s->st_atime = s->st_ctime = s->st_mtime;
-#ifdef HAVE_STRUCT_STAT_ST_MTIM
-    s->st_atim.tv_nsec = s->st_mtim.tv_nsec = s->st_ctim.tv_nsec = 0;
-#endif
 
     /* s->st_dev and s->st_ino must be initialized by vfs_s_new_inode () */
 #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE

lib/vfs/utilvfs.c

@@ -38,6 +38,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if !defined (HAVE_UTIMENSAT) && defined (HAVE_UTIME_H)
+#include <utime.h>
+#endif
+
 #include "lib/global.h"
 #include "lib/unixcompat.h"
 #include "lib/widget.h"         /* message() */
@@ -372,3 +376,102 @@ vfs_get_password (const char *msg)
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
+int
+vfs_utime (const char *path, mc_timesbuf_t *times)
+{
+#ifdef HAVE_UTIMENSAT
+    return utimensat (AT_FDCWD, path, *times, AT_SYMLINK_NOFOLLOW);
+#else
+    return utime (path, times);
+#endif
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+void
+vfs_get_timespecs_from_timesbuf (mc_timesbuf_t *times, mc_timespec_t *atime, mc_timespec_t *mtime)
+{
+#ifdef HAVE_UTIMENSAT
+    atime->tv_sec = (*times)[0].tv_sec;
+    atime->tv_nsec = (*times)[0].tv_nsec;
+    mtime->tv_sec = (*times)[1].tv_sec;
+    mtime->tv_nsec = (*times)[1].tv_nsec;
+#else
+    atime->tv_sec = times->actime;
+    atime->tv_nsec = 0;
+    mtime->tv_sec = times->modtime;
+    mtime->tv_nsec = 0;
+#endif
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+void
+vfs_get_timesbuf_from_stat (const struct stat *s, mc_timesbuf_t *times)
+{
+#ifdef HAVE_UTIMENSAT
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
+    /* POSIX IEEE Std 1003.1-2008 should be the preferred way
+     *
+     * AIX has internal type st_timespec_t conflicting with timespec, so assign per field, for details see:
+     * https://github.com/libuv/libuv/pull/4404
+     */
+    (*times)[0].tv_sec = s->st_atim.tv_sec;
+    (*times)[0].tv_nsec = s->st_atim.tv_nsec;
+    (*times)[1].tv_sec = s->st_mtim.tv_sec;
+    (*times)[1].tv_nsec = s->st_mtim.tv_nsec;
+#elif HAVE_STRUCT_STAT_ST_MTIMESPEC
+    /* Modern BSD solution */
+    (*times)[0] = s->st_atimespec;
+    (*times)[1] = s->st_mtimespec;
+#elif HAVE_STRUCT_STAT_ST_MTIMENSEC
+    /* Legacy BSD solution */
+    (*times)[0].tv_sec = s->st_atime;
+    (*times)[0].tv_nsec = s->st_atimensec;
+    (*times)[1].tv_sec = s->st_mtime;
+    (*times)[1].tv_nsec = s->st_mtimensec;
+#else
+#error "Found utimensat for nanosecond timestamps, but unsupported struct stat format!"
+#endif
+#else
+    times->actime = s->st_atime;
+    times->modtime = s->st_mtime;
+#endif
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+void
+vfs_copy_stat_times (const struct stat *src, struct stat *dst)
+{
+    dst->st_atime = src->st_atime;
+    dst->st_mtime = src->st_mtime;
+    dst->st_ctime = src->st_ctime;
+
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
+    dst->st_atim.tv_nsec = src->st_atim.tv_nsec;
+    dst->st_mtim.tv_nsec = src->st_mtim.tv_nsec;
+    dst->st_ctim.tv_nsec = src->st_ctim.tv_nsec;
+#elif HAVE_STRUCT_STAT_ST_MTIMESPEC
+    dst->st_atimespec.tv_nsec = src->st_atimespec.tv_nsec;
+    dst->st_mtimespec.tv_nsec = src->st_mtimespec.tv_nsec;
+    dst->st_ctimespec.tv_nsec = src->st_ctimespec.tv_nsec;
+#elif HAVE_STRUCT_STAT_ST_MTIMENSEC
+    dst->st_atimensec = src->st_atimensec;
+    dst->st_mtimensec = src->st_mtimensec;
+    dst->st_ctimensec = src->st_ctimensec;
+#endif
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+void
+vfs_zero_stat_times (struct stat *s)
+{
+    const struct stat empty = { 0 };
+
+    vfs_copy_stat_times (&empty, s);
+}
+
+/* --------------------------------------------------------------------------------------------- */

lib/vfs/utilvfs.h

@@ -60,5 +60,13 @@ size_t vfs_parse_ls_lga_get_final_spaces (void);
 gboolean vfs_parse_month (const char *str, struct tm *tim);
 int vfs_parse_filedate (int idx, time_t * t);
 
+int vfs_utime (const char *path, mc_timesbuf_t *times);
+void vfs_get_timespecs_from_timesbuf (mc_timesbuf_t *times, mc_timespec_t *atime,
+                                      mc_timespec_t *mtime);
+void vfs_get_timesbuf_from_stat (const struct stat *s, mc_timesbuf_t *times);
+void vfs_copy_stat_times (const struct stat *src, struct stat *dst);
+void vfs_zero_stat_times (struct stat *s);
+
 /*** inline functions ****************************************************************************/
+
 #endif

lib/vfs/vfs.h

@@ -95,6 +95,12 @@ typedef struct timespec mc_timesbuf_t[2];
 typedef struct utimbuf mc_timesbuf_t;
 #endif
 
+typedef struct mc_timespec
+{
+    time_t tv_sec;
+    long tv_nsec;
+} mc_timespec_t;
+
 /*** enums ***************************************************************************************/
 
 typedef enum

src/filemanager/cmd.c

@@ -210,7 +210,7 @@ compare_files (const vfs_path_t *vpath1, const vfs_path_t *vpath2, off_t size)
 #else
             /* Don't have mmap() :( Even more ugly :) */
             char buf1[BUFSIZ], buf2[BUFSIZ];
-            int n1, n2;
+            ssize_t n1, n2;
 
             rotate_dash (TRUE);
             do

src/filemanager/file.c

@@ -67,6 +67,7 @@
 #include "lib/strutil.h"
 #include "lib/util.h"
 #include "lib/vfs/vfs.h"
+#include "lib/vfs/utilvfs.h"
 #include "lib/widget.h"
 
 #include "src/setup.h"
@@ -927,20 +928,6 @@ check_same_file (const char *a, const struct stat *ast, const char *b, const str
     return TRUE;
 }
 
-/* --------------------------------------------------------------------------------------------- */
-
-static void
-get_times (const struct stat *sb, mc_timesbuf_t *times)
-{
-#ifdef HAVE_UTIMENSAT
-    (*times)[0] = sb->st_atim;
-    (*times)[1] = sb->st_mtim;
-#else
-    times->actime = sb->st_atime;
-    times->modtime = sb->st_mtime;
-#endif
-}
-
 /* --------------------------------------------------------------------------------------------- */
 /* {{{ Query/status report routines */
 
@@ -1297,7 +1284,7 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont
                 {
                     mc_timesbuf_t times;
 
-                    get_times (&src_stat, &times);
+                    vfs_get_timesbuf_from_stat (&src_stat, &times);
                     mc_utime (dst_vpath, &times);
                 }
                 goto retry_src_remove;
@@ -2375,7 +2362,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx,
         }
     }
 
-    get_times (&src_stat, &times);
+    vfs_get_timesbuf_from_stat (&src_stat, &times);
 
     if (!ctx->do_append)
     {
@@ -3232,7 +3219,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char
         if (attrs_ok)
             mc_fsetflags (dst_vpath, attrs);
 
-        get_times (&src_stat, &times);
+        vfs_get_timesbuf_from_stat (&src_stat, &times);
         mc_utime (dst_vpath, &times);
     }
     else