diff options
| author |   tholo <tholo@openbsd.org> | 1996-03-02 00:46:00 +0000 |
|---|---|---|
| committer | tholo <tholo@openbsd.org> | 1996-03-02 00:46:00 +0000 |
| commit | c9fd28a479c1ba7ea4da630d10bc568f1b349e81 (patch) | |
| tree | 66510ec83cba5d54b0740339f0a7d5616e8d4af4 | |
| parent | timespec members are now named tv_{,u}sec again (diff) | |
| download | wireguard-openbsd-c9fd28a479c1ba7ea4da630d10bc568f1b349e81.tar.xz wireguard-openbsd-c9fd28a479c1ba7ea4da630d10bc568f1b349e81.zip | |
timespec members are now named tv_{,u}sec
| -rw-r--r-- | usr.sbin/mtree/compare.c | 9 | ||||
| -rw-r--r-- | usr.sbin/mtree/create.c | 5 | ||||
| -rw-r--r-- | usr.sbin/mtree/spec.c | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c index 2e22d69df9e..1d836c936be 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/mtree/compare.c @@ -1,4 +1,5 @@ /* $NetBSD: compare.c,v 1.9 1995/10/22 20:12:07 pk Exp $ */ +/* $OpenBSD: compare.c,v 1.3 1996/03/02 00:46:00 tholo Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -176,13 +177,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 e2763491ffb..9c3f9178712 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -1,4 +1,5 @@ /* $NetBSD: create.c,v 1.9 1995/03/07 21:12:06 cgd Exp $ */ +/* $OpenBSD: create.c,v 1.2 1996/03/02 00:46:02 tholo Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -158,8 +159,8 @@ statf(p) output(&indent, "size=%qd", p->fts_statp->st_size); if (keys & F_TIME) output(&indent, "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 7eaefbe4452..99179609d80 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/mtree/spec.c @@ -1,4 +1,5 @@ /* $NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $ */ +/* $OpenBSD: spec.c,v 1.2 1996/03/02 00:46:04 tholo Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -220,11 +221,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; |