summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/mtree/compare.c8
-rw-r--r--usr.sbin/mtree/create.c4
-rw-r--r--usr.sbin/mtree/spec.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index f927c325665f..efe24294016c 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -171,13 +171,13 @@ typeerr: LABEL;
* Catches nano-second differences, but doesn't display them.
*/
if ((s->flags & F_TIME) &&
- ((s->st_mtimespec.ts_sec != p->fts_statp->st_mtimespec.ts_sec) ||
- (s->st_mtimespec.ts_nsec != p->fts_statp->st_mtimespec.ts_nsec))) {
+ ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtimespec.tv_sec) ||
+ (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtimespec.tv_nsec))) {
LABEL;
(void)printf("%smodification time (%.24s, ",
- tab, ctime(&s->st_mtimespec.ts_sec));
+ tab, ctime(&s->st_mtimespec.tv_sec));
(void)printf("%.24s)\n",
- ctime(&p->fts_statp->st_mtimespec.ts_sec));
+ ctime(&p->fts_statp->st_mtimespec.tv_sec));
tab = "\t";
}
if (s->flags & F_CKSUM)
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 694dec7d0372..44ee411d9b61 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -179,8 +179,8 @@ statf(indent, p)
output(indent, &offset, "size=%qd", p->fts_statp->st_size);
if (keys & F_TIME)
output(indent, &offset, "time=%ld.%ld",
- p->fts_statp->st_mtimespec.ts_sec,
- p->fts_statp->st_mtimespec.ts_nsec);
+ p->fts_statp->st_mtimespec.tv_sec,
+ p->fts_statp->st_mtimespec.tv_nsec);
if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
crc(fd, &val, &len))
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 5df0534d309b..7ab6cf840fdf 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -220,11 +220,11 @@ set(t, ip)
err("%s", strerror(errno));
break;
case F_TIME:
- ip->st_mtimespec.ts_sec = strtoul(val, &ep, 10);
+ ip->st_mtimespec.tv_sec = strtoul(val, &ep, 10);
if (*ep != '.')
err("invalid time %s", val);
val = ep + 1;
- ip->st_mtimespec.ts_nsec = strtoul(val, &ep, 10);
+ ip->st_mtimespec.tv_nsec = strtoul(val, &ep, 10);
if (*ep)
err("invalid time %s", val);
break;