summaryrefslogtreecommitdiffstats
path: root/usr.bin/file/print.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2013-04-17 15:01:26 +0000
committerderaadt <deraadt@openbsd.org>2013-04-17 15:01:26 +0000
commitcd460c0f885adc8ec9461ab15722c2533ab6ac6d (patch)
tree9671b589939da4fc863420819d3b2c471df67523 /usr.bin/file/print.c
parent(long long) and %lld for time_t output (diff)
downloadwireguard-openbsd-cd460c0f885adc8ec9461ab15722c2533ab6ac6d.tar.xz
wireguard-openbsd-cd460c0f885adc8ec9461ab15722c2533ab6ac6d.zip
variety of fixes to correct large time_t code. it is quite broken upstream.
ok chl
Diffstat (limited to 'usr.bin/file/print.c')
-rw-r--r--usr.bin/file/print.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index cfcddaee99e..8b5b5d63b90 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.16 2009/10/27 23:59:37 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.17 2013/04/17 15:01:26 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -146,13 +146,13 @@ file_mdump(struct magic *m)
case FILE_LEQDATE:
case FILE_BEQDATE:
(void)fprintf(stderr, "%s,",
- file_fmttime((uint32_t)m->value.q, 1));
+ file_fmttime(m->value.q, 1));
break;
case FILE_QLDATE:
case FILE_LEQLDATE:
case FILE_BEQLDATE:
(void)fprintf(stderr, "%s,",
- file_fmttime((uint32_t)m->value.q, 0));
+ file_fmttime(m->value.q, 0));
break;
case FILE_FLOAT:
case FILE_BEFLOAT:
@@ -196,7 +196,7 @@ file_magwarn(struct magic_set *ms, const char *f, ...)
}
protected const char *
-file_fmttime(uint32_t v, int local)
+file_fmttime(uint64_t v, int local)
{
char *pp;
time_t t = (time_t)v;