Sun Aug 26 23:34:52 2018 UTC ()
-G cannot be specified alongside -i or -P.

Heads up by <leot>


(sevan)
diff -r1.48 -r1.49 src/bin/df/df.1
diff -r1.92 -r1.93 src/bin/df/df.c
cvs diff -r1.48 -r1.49 src/bin/df/df.1 (expand / switch to unified diff)

--- src/bin/df/df.1 2018/08/26 22:25:37 1.48
+++ src/bin/df/df.1 2018/08/26 23:34:52 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: df.1,v 1.48 2018/08/26 22:25:37 sevan Exp $ 1.\" $NetBSD: df.1,v 1.49 2018/08/26 23:34:52 sevan Exp $
2.\" 2.\"
3.\" Copyright (c) 1989, 1990, 1993 3.\" Copyright (c) 1989, 1990, 1993
4.\" The Regents of the University of California. All rights reserved. 4.\" The Regents of the University of California. All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 3. Neither the name of the University nor the names of its contributors 14.\" 3. Neither the name of the University nor the names of its contributors
@@ -19,36 +19,36 @@ @@ -19,36 +19,36 @@
19.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 19.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 20.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 21.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
22.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 22.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 23.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28.\" SUCH DAMAGE. 28.\" SUCH DAMAGE.
29.\" 29.\"
30.\" @(#)df.1 8.2 (Berkeley) 1/13/92 30.\" @(#)df.1 8.2 (Berkeley) 1/13/92
31.\" 31.\"
32.Dd August 26, 2018 32.Dd August 27, 2018
33.Dt DF 1 33.Dt DF 1
34.Os 34.Os
35.Sh NAME 35.Sh NAME
36.Nm df 36.Nm df
37.Nd display free disk space 37.Nd display free disk space
38.Sh SYNOPSIS 38.Sh SYNOPSIS
39.Nm 39.Nm
40.Op Fl aGgln 40.Op Fl agln
41.Op Fl hkm | Fl ihkm | Fl Pk 41.Op Fl Ghkm | Fl ihkm | Fl Pk
42.Op Fl t Ar type 42.Op Fl t Ar type
43.Op Ar file | Ar file_system ... 43.Op Ar file | Ar file_system ...
44.Sh DESCRIPTION 44.Sh DESCRIPTION
45.Nm 45.Nm
46displays statistics about the amount of free disk space on the specified 46displays statistics about the amount of free disk space on the specified
47.Ar file_system 47.Ar file_system
48or on the file system of which 48or on the file system of which
49.Ar file 49.Ar file
50is a part. 50is a part.
51By default, all sizes are reported in 512-byte block counts. 51By default, all sizes are reported in 512-byte block counts.
52If neither a file or a 52If neither a file or a
53.Ar file_system 53.Ar file_system
54operand is specified, 54operand is specified,
cvs diff -r1.92 -r1.93 src/bin/df/df.c (expand / switch to unified diff)

--- src/bin/df/df.c 2016/03/05 08:15:01 1.92
+++ src/bin/df/df.c 2018/08/26 23:34:52 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: df.c,v 1.92 2016/03/05 08:15:01 kamil Exp $ */ 1/* $NetBSD: df.c,v 1.93 2018/08/26 23:34:52 sevan Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1980, 1990, 1993, 1994 4 * Copyright (c) 1980, 1990, 1993, 1994
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * (c) UNIX System Laboratories, Inc. 6 * (c) UNIX System Laboratories, Inc.
7 * All or some portions of this file are derived from material licensed 7 * All or some portions of this file are derived from material licensed
8 * to the University of California by American Telephone and Telegraph 8 * to the University of California by American Telephone and Telegraph
9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
10 * the permission of UNIX System Laboratories, Inc. 10 * the permission of UNIX System Laboratories, Inc.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -35,27 +35,27 @@ @@ -35,27 +35,27 @@
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38#ifndef lint 38#ifndef lint
39__COPYRIGHT( 39__COPYRIGHT(
40"@(#) Copyright (c) 1980, 1990, 1993, 1994\ 40"@(#) Copyright (c) 1980, 1990, 1993, 1994\
41 The Regents of the University of California. All rights reserved."); 41 The Regents of the University of California. All rights reserved.");
42#endif /* not lint */ 42#endif /* not lint */
43 43
44#ifndef lint 44#ifndef lint
45#if 0 45#if 0
46static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; 46static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
47#else 47#else
48__RCSID("$NetBSD: df.c,v 1.92 2016/03/05 08:15:01 kamil Exp $"); 48__RCSID("$NetBSD: df.c,v 1.93 2018/08/26 23:34:52 sevan Exp $");
49#endif 49#endif
50#endif /* not lint */ 50#endif /* not lint */
51 51
52#include <sys/param.h> 52#include <sys/param.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/mount.h> 54#include <sys/mount.h>
55 55
56#include <assert.h> 56#include <assert.h>
57#include <err.h> 57#include <err.h>
58#include <errno.h> 58#include <errno.h>
59#include <fcntl.h> 59#include <fcntl.h>
60#include <locale.h> 60#include <locale.h>
61#include <util.h> 61#include <util.h>
@@ -502,19 +502,19 @@ prtstat(struct statvfs *sfsp, int maxwid @@ -502,19 +502,19 @@ prtstat(struct statvfs *sfsp, int maxwid
502 (void)printf(" %8jd %8jd %4s%%", 502 (void)printf(" %8jd %8jd %4s%%",
503 (intmax_t)used, (intmax_t)sfsp->f_ffree, 503 (intmax_t)used, (intmax_t)sfsp->f_ffree,
504 inodes == 0 ? (used == 0 ? empty : full) : 504 inodes == 0 ? (used == 0 ? empty : full) :
505 strspct(pb, sizeof(pb), used, inodes, 0)); 505 strspct(pb, sizeof(pb), used, inodes, 0));
506 } 506 }
507 (void)printf(" %s\n", sfsp->f_mntonname); 507 (void)printf(" %s\n", sfsp->f_mntonname);
508} 508}
509 509
510static void 510static void
511usage(void) 511usage(void)
512{ 512{
513 513
514 (void)fprintf(stderr, 514 (void)fprintf(stderr,
515 "Usage: %s [-aGgln] [-hkm|-ihkm|-Pk] [-t type] [file | " 515 "Usage: %s [-agln] [-Ghkm|-ihkm|-Pk] [-t type] [file | "
516 "file_system ...]\n", 516 "file_system ...]\n",
517 getprogname()); 517 getprogname());
518 exit(1); 518 exit(1);
519 /* NOTREACHED */ 519 /* NOTREACHED */
520} 520}