Copy entire st_*tim structs at once, rather than copying

the st_*time and (obsolete) st_*timensec members separately.

ok millert@

diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index b47c96b..5876d5c 100644 (file)
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tar.c,v 1.71 2023/06/26 18:00:59 millert Exp $        */
+/*     $OpenBSD: tar.c,v 1.72 2023/08/19 04:21:05 guenther Exp $       */
 /*     $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $      */
 
 /*-
@@ -414,8 +414,7 @@ tar_rd(ARCHD *arcn, char *buf)
                arcn->sb.st_mtime = MAX_TIME_T;
        else
                arcn->sb.st_mtime = val;
-       arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime;
-       arcn->sb.st_ctimensec = arcn->sb.st_atimensec = arcn->sb.st_mtimensec;
+       arcn->sb.st_ctim = arcn->sb.st_atim = arcn->sb.st_mtim;
 
        /*
         * have to look at the last character, it may be a '/' and that is used
@@ -793,12 +792,10 @@ reset:
                        arcn->sb.st_mtime = val;
        }
        if (arcn->sb.st_ctime == 0) {
-               arcn->sb.st_ctime = arcn->sb.st_mtime;
-               arcn->sb.st_ctimensec = arcn->sb.st_mtimensec;
+               arcn->sb.st_ctim = arcn->sb.st_mtim;
        }
        if (arcn->sb.st_atime == 0) {
-               arcn->sb.st_atime = arcn->sb.st_mtime;
-               arcn->sb.st_atimensec = arcn->sb.st_mtimensec;
+               arcn->sb.st_atim = arcn->sb.st_mtim;
        }
 
        /*

diff --git a/usr.bin/make/timestamp.h b/usr.bin/make/timestamp.h
index b64320b..e54b76e 100644 (file)
--- a/usr.bin/make/timestamp.h
+++ b/usr.bin/make/timestamp.h
@@ -1,7 +1,7 @@
 #ifndef TIMESTAMP_H
 #define TIMESTAMP_H
 
-/*     $OpenBSD: timestamp.h,v 1.10 2013/05/22 12:14:08 espie Exp $ */
+/*     $OpenBSD: timestamp.h,v 1.11 2023/08/19 04:21:06 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -51,8 +51,7 @@
 
 #define ts_set_from_stat(s, t) \
 do { \
-       (t).tv_sec = (s).st_mtime; \
-       (t).tv_nsec = (s).st_mtimensec; \
+       (t) = (s).st_mtim; \
        if (is_out_of_date(t)) \
                (t).tv_nsec++; \
 } while (0)

diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 1270f1a..fa564b0 100644 (file)
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: walk.c,v 1.11 2022/01/11 05:34:32 jsg Exp $   */
+/*     $OpenBSD: walk.c,v 1.12 2023/08/19 04:21:06 guenther Exp $      */
 /*     $NetBSD: walk.c,v 1.29 2015/11/25 00:48:49 christos Exp $       */
 
 /*
@@ -205,12 +205,10 @@ create_fsnode(const char *root, const char *path, const char *name,
        cur->inode->nlink = 1;
        cur->inode->st = *stbuf;
        if (Tflag) {
-               cur->inode->st.st_atime = stampts;
-               cur->inode->st.st_mtime = stampts;
-               cur->inode->st.st_ctime = stampts;
-               cur->inode->st.st_atimensec = 0;
-               cur->inode->st.st_mtimensec = 0;
-               cur->inode->st.st_ctimensec = 0;
+               cur->inode->st.st_atim.tv_sec = stampts;
+               cur->inode->st.st_atim.tv_nsec = 0;
+               cur->inode->st.st_mtim = cur->inode->st.st_ctim =
+                   cur->inode->st.st_atim;
        }
        return (cur);
 }