Module Name: src
Committed By: sevan
Date: Sun Aug 26 23:34:52 UTC 2018
Modified Files:
src/bin/df: df.1 df.c
Log Message:
-G cannot be specified alongside -i or -P.
Heads up by <leot>
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/bin/df/df.1
cvs rdiff -u -r1.92 -r1.93 src/bin/df/df.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/df/df.1
diff -u src/bin/df/df.1:1.48 src/bin/df/df.1:1.49
--- src/bin/df/df.1:1.48 Sun Aug 26 22:25:37 2018
+++ src/bin/df/df.1 Sun Aug 26 23:34:52 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: df.1,v 1.48 2018/08/26 22:25:37 sevan Exp $
+.\" $NetBSD: df.1,v 1.49 2018/08/26 23:34:52 sevan Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)df.1 8.2 (Berkeley) 1/13/92
.\"
-.Dd August 26, 2018
+.Dd August 27, 2018
.Dt DF 1
.Os
.Sh NAME
@@ -37,8 +37,8 @@
.Nd display free disk space
.Sh SYNOPSIS
.Nm
-.Op Fl aGgln
-.Op Fl hkm | Fl ihkm | Fl Pk
+.Op Fl agln
+.Op Fl Ghkm | Fl ihkm | Fl Pk
.Op Fl t Ar type
.Op Ar file | Ar file_system ...
.Sh DESCRIPTION
Index: src/bin/df/df.c
diff -u src/bin/df/df.c:1.92 src/bin/df/df.c:1.93
--- src/bin/df/df.c:1.92 Sat Mar 5 08:15:01 2016
+++ src/bin/df/df.c Sun Aug 26 23:34:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.92 2016/03/05 08:15:01 kamil Exp $ */
+/* $NetBSD: df.c,v 1.93 2018/08/26 23:34:52 sevan Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: df.c,v 1.92 2016/03/05 08:15:01 kamil Exp $");
+__RCSID("$NetBSD: df.c,v 1.93 2018/08/26 23:34:52 sevan Exp $");
#endif
#endif /* not lint */
@@ -512,7 +512,7 @@ usage(void)
{
(void)fprintf(stderr,
- "Usage: %s [-aGgln] [-hkm|-ihkm|-Pk] [-t type] [file | "
+ "Usage: %s [-agln] [-Ghkm|-ihkm|-Pk] [-t type] [file | "
"file_system ...]\n",
getprogname());
exit(1);
