bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update utimecmp to use new stat-time module


From: Paul Eggert
Subject: update utimecmp to use new stat-time module
Date: Fri, 16 Sep 2005 00:20:01 -0700
User-agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux)

I installed this as well: it's needed by coreutils but not tar.

2005-09-16  Paul Eggert  <address@hidden>

        * lib/utimecmp.c: Include stat-time.h.
        (SYSCALL_RESOLUTION): Depend on whether various struct stat
        members exist, not on the obsolescent ST_MTIM_NSEC.
        (utimecmp): Use the new stat-time functions rater than TIMESPEC_NS.
        * modules/utimecmp (Depends-on): Add stat-time.

--- lib/utimecmp.c      14 May 2005 06:03:58 -0000      1.3
+++ lib/utimecmp.c      16 Sep 2005 07:16:22 -0000      1.4
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include "hash.h"
 #include "intprops.h"
+#include "stat-time.h"
 #include "timespec.h"
 #include "utimens.h"
 #include "xalloc.h"
@@ -56,7 +57,12 @@ enum { BILLION = 1000 * 1000 * 1000 };
 /* Best possible resolution that utimens can set and stat can return,
    due to system-call limitations.  It must be a power of 10 that is
    no greater than 1 billion.  */
-#if HAVE_WORKING_UTIMES && defined ST_MTIM_NSEC
+#if (HAVE_WORKING_UTIMES                                       \
+     && (defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC              \
+        || defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC       \
+        || defined HAVE_STRUCT_STAT_ST_ATIMENSEC               \
+        || defined HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC    \
+        || defined HAVE_STRUCT_STAT_ST_SPARE1))
 enum { SYSCALL_RESOLUTION = 1000 };
 #else
 enum { SYSCALL_RESOLUTION = BILLION };
@@ -139,8 +145,8 @@ utimecmp (char const *dst_name,
   /* Destination and source time stamps.  */
   time_t dst_s = dst_stat->st_mtime;
   time_t src_s = src_stat->st_mtime;
-  int dst_ns = TIMESPEC_NS (dst_stat->st_mtim);
-  int src_ns = TIMESPEC_NS (src_stat->st_mtim);
+  int dst_ns = get_stat_mtime_ns (dst_stat);
+  int src_ns = get_stat_mtime_ns (src_stat);
 
   if (options & UTIMECMP_TRUNCATE_SOURCE)
     {
@@ -186,8 +192,8 @@ utimecmp (char const *dst_name,
          time_t dst_a_s = dst_stat->st_atime;
          time_t dst_c_s = dst_stat->st_ctime;
          time_t dst_m_s = dst_s;
-         int dst_a_ns = TIMESPEC_NS (dst_stat->st_atim);
-         int dst_c_ns = TIMESPEC_NS (dst_stat->st_ctim);
+         int dst_a_ns = get_stat_atime_ns (dst_stat);
+         int dst_c_ns = get_stat_ctime_ns (dst_stat);
          int dst_m_ns = dst_ns;
 
          /* Set RES to an upper bound on the file system resolution
@@ -280,7 +286,7 @@ utimecmp (char const *dst_name,
 
                if (stat_result
                    | (dst_status.st_mtime ^ dst_m_s)
-                   | (TIMESPEC_NS (dst_status.st_mtim) ^ dst_m_ns))
+                   | (get_stat_mtime_ns (&dst_status) ^ dst_m_ns))
                  {
                    /* The modification time changed, or we can't tell whether
                       it changed.  Change it back as best we can.  */
@@ -298,7 +304,7 @@ utimecmp (char const *dst_name,
              {
                int old_res = res;
                int a = (BILLION * (dst_status.st_mtime & 1)
-                        + TIMESPEC_NS (dst_status.st_mtim));
+                        + get_stat_mtime_ns (&dst_status));
 
                res = SYSCALL_RESOLUTION;
 
--- modules/utimecmp    6 May 2005 17:22:45 -0000       1.5
+++ modules/utimecmp    16 Sep 2005 07:18:35 -0000      1.6
@@ -9,6 +9,7 @@ m4/utimecmp.m4
 
 Depends-on:
 hash
+stat-time
 timespec
 utimens
 xalloc




reply via email to

[Prev in Thread] Current Thread [Next in Thread]