diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2023-08-08 04:45:45 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2023-08-08 04:45:45 +0000 |
| commit | 481d9f43ae7c775106bfb762594729cd3ec7e955 (patch) | |
| tree | b15bafbef01fbc7269f358d14dc4ca2b78cccdaf | |
| parent | be0dd937d277209fa9b5812aa4f7a81f606c1ade (diff) | |
Replace use of the old BSD st_*timensec members in struct stat with
the POSIX-standard st_*tim.tv_nsec members.
ok millert@
| -rw-r--r-- | bin/ls/cmp.c | 26 | ||||
| -rw-r--r-- | usr.sbin/makefs/ffs.c | 14 |
2 files changed, 20 insertions, 20 deletions
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c index fa4f11aeda6..d52062fe0fd 100644 --- a/bin/ls/cmp.c +++ b/bin/ls/cmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmp.c,v 1.6 2009/10/27 23:59:21 deraadt Exp $ */ +/* $OpenBSD: cmp.c,v 1.7 2023/08/08 04:45:44 guenther Exp $ */ /* $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */ /* @@ -61,9 +61,9 @@ modcmp(const FTSENT *a, const FTSENT *b) return (1); else if (b->fts_statp->st_mtime < a->fts_statp->st_mtime) return (-1); - else if (b->fts_statp->st_mtimensec > a->fts_statp->st_mtimensec) + else if (b->fts_statp->st_mtim.tv_nsec > a->fts_statp->st_mtim.tv_nsec) return (1); - else if (b->fts_statp->st_mtimensec < a->fts_statp->st_mtimensec) + else if (b->fts_statp->st_mtim.tv_nsec < a->fts_statp->st_mtim.tv_nsec) return (-1); else return (namecmp(a, b)); @@ -76,9 +76,9 @@ revmodcmp(const FTSENT *a, const FTSENT *b) return (-1); else if (b->fts_statp->st_mtime < a->fts_statp->st_mtime) return (1); - else if (b->fts_statp->st_mtimensec > a->fts_statp->st_mtimensec) + else if (b->fts_statp->st_mtim.tv_nsec > a->fts_statp->st_mtim.tv_nsec) return (-1); - else if (b->fts_statp->st_mtimensec < a->fts_statp->st_mtimensec) + else if (b->fts_statp->st_mtim.tv_nsec < a->fts_statp->st_mtim.tv_nsec) return (1); else return (revnamecmp(a, b)); @@ -91,9 +91,9 @@ acccmp(const FTSENT *a, const FTSENT *b) return (1); else if (b->fts_statp->st_atime < a->fts_statp->st_atime) return (-1); - else if (b->fts_statp->st_atimensec > a->fts_statp->st_atimensec) + else if (b->fts_statp->st_atim.tv_nsec > a->fts_statp->st_atim.tv_nsec) return (1); - else if (b->fts_statp->st_atimensec < a->fts_statp->st_atimensec) + else if (b->fts_statp->st_atim.tv_nsec < a->fts_statp->st_atim.tv_nsec) return (-1); else return (namecmp(a, b)); @@ -106,9 +106,9 @@ revacccmp(const FTSENT *a, const FTSENT *b) return (-1); else if (b->fts_statp->st_atime < a->fts_statp->st_atime) return (1); - else if (b->fts_statp->st_atimensec > a->fts_statp->st_atimensec) + else if (b->fts_statp->st_atim.tv_nsec > a->fts_statp->st_atim.tv_nsec) return (-1); - else if (b->fts_statp->st_atimensec < a->fts_statp->st_atimensec) + else if (b->fts_statp->st_atim.tv_nsec < a->fts_statp->st_atim.tv_nsec) return (1); else return (revnamecmp(a, b)); @@ -121,9 +121,9 @@ statcmp(const FTSENT *a, const FTSENT *b) return (1); else if (b->fts_statp->st_ctime < a->fts_statp->st_ctime) return (-1); - else if (b->fts_statp->st_ctimensec > a->fts_statp->st_ctimensec) + else if (b->fts_statp->st_ctim.tv_nsec > a->fts_statp->st_ctim.tv_nsec) return (1); - else if (b->fts_statp->st_ctimensec < a->fts_statp->st_ctimensec) + else if (b->fts_statp->st_ctim.tv_nsec < a->fts_statp->st_ctim.tv_nsec) return (-1); else return (namecmp(a, b)); @@ -136,9 +136,9 @@ revstatcmp(const FTSENT *a, const FTSENT *b) return (-1); else if (b->fts_statp->st_ctime < a->fts_statp->st_ctime) return (1); - else if (b->fts_statp->st_ctimensec > a->fts_statp->st_ctimensec) + else if (b->fts_statp->st_ctim.tv_nsec > a->fts_statp->st_ctim.tv_nsec) return (-1); - else if (b->fts_statp->st_ctimensec < a->fts_statp->st_ctimensec) + else if (b->fts_statp->st_ctim.tv_nsec < a->fts_statp->st_ctim.tv_nsec) return (1); else return (revnamecmp(a, b)); diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 71845bc4c1e..fe203a40f21 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.c,v 1.37 2023/04/25 08:57:11 krw Exp $ */ +/* $OpenBSD: ffs.c,v 1.38 2023/08/08 04:45:44 guenther Exp $ */ /* $NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $ */ /* @@ -611,9 +611,9 @@ ffs_build_dinode1(struct ufs1_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, dinp->di_atime = cur->inode->st.st_atime; dinp->di_mtime = cur->inode->st.st_mtime; dinp->di_ctime = cur->inode->st.st_ctime; - dinp->di_atimensec = cur->inode->st.st_atimensec; - dinp->di_mtimensec = cur->inode->st.st_mtimensec; - dinp->di_ctimensec = cur->inode->st.st_ctimensec; + dinp->di_atimensec = cur->inode->st.st_atim.tv_nsec; + dinp->di_mtimensec = cur->inode->st.st_mtim.tv_nsec; + dinp->di_ctimensec = cur->inode->st.st_ctim.tv_nsec; /* not set: di_db, di_ib, di_blocks, di_spare */ membuf = NULL; @@ -653,9 +653,9 @@ ffs_build_dinode2(struct ufs2_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, dinp->di_atime = cur->inode->st.st_atime; dinp->di_mtime = cur->inode->st.st_mtime; dinp->di_ctime = cur->inode->st.st_ctime; - dinp->di_atimensec = cur->inode->st.st_atimensec; - dinp->di_mtimensec = cur->inode->st.st_mtimensec; - dinp->di_ctimensec = cur->inode->st.st_ctimensec; + dinp->di_atimensec = cur->inode->st.st_atim.tv_nsec; + dinp->di_mtimensec = cur->inode->st.st_mtim.tv_nsec; + dinp->di_ctimensec = cur->inode->st.st_ctim.tv_nsec; /* not set: di_db, di_ib, di_blocks, di_spare */ membuf = NULL; |