summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mtree
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-08-14 20:53:19 +0000
committerkrw <krw@openbsd.org>2016-08-14 20:53:19 +0000
commit05c7c0d01207fe578c2f61e1bcc8a510e37f409a (patch)
treef6d3c8b00263ee0a101a0731e6f42ac4393cafe8 /usr.sbin/mtree
parentDon't reinvent rlim_t; when printing it use %llu and cast to (diff)
downloadwireguard-openbsd-05c7c0d01207fe578c2f61e1bcc8a510e37f409a.tar.xz
wireguard-openbsd-05c7c0d01207fe578c2f61e1bcc8a510e37f409a.zip
%qd -> %lld + (long long) for off_t's.
ok guenther@ natano@
Diffstat (limited to 'usr.sbin/mtree')
-rw-r--r--usr.sbin/mtree/compare.c7
-rw-r--r--usr.sbin/mtree/create.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 0a624e2858e..aff4fa8a392 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
/* $NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $ */
-/* $OpenBSD: compare.c,v 1.25 2015/12/21 19:37:21 mmcc Exp $ */
+/* $OpenBSD: compare.c,v 1.26 2016/08/14 20:53:19 krw Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -182,8 +182,9 @@ typeerr: LABEL;
}
if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) {
LABEL;
- (void)printf("%ssize (%qd, %qd)\n",
- tab, s->st_size, p->fts_statp->st_size);
+ (void)printf("%ssize (%lld, %lld)\n",
+ tab, (long long)s->st_size,
+ (long long)p->fts_statp->st_size);
tab = "\t";
}
/*
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index eac12974748..b0b280a5c3b 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,5 +1,5 @@
/* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */
-/* $OpenBSD: create.c,v 1.30 2015/01/16 06:40:18 deraadt Exp $ */
+/* $OpenBSD: create.c,v 1.31 2016/08/14 20:53:19 krw Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -185,7 +185,8 @@ statf(int indent, FTSENT *p)
if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
- output(indent, &offset, "size=%qd", p->fts_statp->st_size);
+ output(indent, &offset, "size=%lld",
+ (long long)p->fts_statp->st_size);
if (keys & F_TIME)
output(indent, &offset, "time=%lld.%ld",
(long long)p->fts_statp->st_mtimespec.tv_sec,