aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-24 02:58:51 +0200
committerDuncaen <mail@duncano.de>2017-05-24 03:20:00 +0200
commit9841d9f699b4c83ff35b8b45ad43063f32d17f6f (patch)
treee801c21e406f0753eaadf823c96a3f7d7c120754
parentb0fd4d8c8d8fbe5595978cc62b1103aebc8656e1 (diff)
downloadlobase-9841d9f699b4c83ff35b8b45ad43063f32d17f6f.tar.gz
bin/df: update to OPENBSD_6_1
-rw-r--r--bin/df/df.16
-rw-r--r--bin/df/df.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/df/df.1 b/bin/df/df.1
index d6383f6..89dd51a 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: df.1,v 1.47 2014/03/17 21:32:12 jmc Exp $
+.\" $OpenBSD: df.1,v 1.48 2016/08/10 19:46:43 schwarze Exp $
.\" $NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)df.1 8.2 (Berkeley) 1/13/92
.\"
-.Dd $Mdocdate: March 17 2014 $
+.Dd $Mdocdate: August 10 2016 $
.Dt DF 1
.Os
.Sh NAME
@@ -176,4 +176,4 @@ specification.
A
.Nm
utility appeared in
-.At v3 .
+.At v1 .
diff --git a/bin/df/df.c b/bin/df/df.c
index df28339..1011099 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.58 2016/03/14 14:44:03 mmcc Exp $ */
+/* $OpenBSD: df.c,v 1.59 2016/08/14 21:07:40 krw Exp $ */
/* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */
/*
@@ -454,8 +454,8 @@ bread(int rfd, off_t off, void *buf, int cnt)
if ((nr = pread(rfd, buf, cnt, off)) != cnt) {
/* Probably a dismounted disk if errno == EIO. */
if (errno != EIO)
- (void)fprintf(stderr, "\ndf: %qd: %s\n",
- off, strerror(nr > 0 ? EIO : errno));
+ (void)fprintf(stderr, "\ndf: %lld: %s\n",
+ (long long)off, strerror(nr > 0 ? EIO : errno));
return (0);
}
return (1);