Module Name: src
Committed By: martin
Date: Tue Aug 28 13:21:42 UTC 2018
Modified Files:
src/bin/df [netbsd-8]: df.1 df.c
src/bin/ksh [netbsd-8]: ksh.Man
src/bin/ln [netbsd-8]: ln.c
src/external/bsd/top/dist [netbsd-8]: top.1.in
src/sbin/amrctl [netbsd-8]: amrctl.c
src/sbin/fsck_ext2fs [netbsd-8]: fsck_ext2fs.8 main.c
src/sbin/gpt [netbsd-8]: main.c
Log Message:
Pull up following revision(s) (requested by sevan in ticket #992):
external/bsd/top/dist/top.1.in: revision 1.11
sbin/gpt/main.c: revision 1.12
sbin/amrctl/amrctl.c: revision 1.11
bin/df/df.c: revision 1.93
sbin/fsck_ext2fs/fsck_ext2fs.8: revision 1.21
sbin/fsck_ext2fs/main.c: revision 1.38
bin/ksh/ksh.Man: revision 1.26
bin/ln/ln.c: revision 1.40
bin/df/df.1: revision 1.48
bin/df/df.1: revision 1.49
Document the WCPU field.
Match SYNOPSIS with usage()
-G cannot be specified alongside -i or -P.
Heads up by <leot>
Add -l to SYNOPSIS
Update usage to include -w
Match sequence as per SYNOPSIS in manual
Remove reference to -c flag which was never implemented.
Remove references to -c flag which was never included.
Add the -T flag to usage()
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.6.1 src/bin/df/df.1
cvs rdiff -u -r1.92 -r1.92.8.1 src/bin/df/df.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/bin/ksh/ksh.Man
cvs rdiff -u -r1.39 -r1.39.4.1 src/bin/ln/ln.c
cvs rdiff -u -r1.10 -r1.10.6.1 src/external/bsd/top/dist/top.1.in
cvs rdiff -u -r1.10 -r1.10.18.1 src/sbin/amrctl/amrctl.c
cvs rdiff -u -r1.20 -r1.20.6.1 src/sbin/fsck_ext2fs/fsck_ext2fs.8
cvs rdiff -u -r1.37 -r1.37.34.1 src/sbin/fsck_ext2fs/main.c
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/sbin/gpt/main.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.46 src/bin/df/df.1:1.46.6.1
--- src/bin/df/df.1:1.46 Wed Aug 10 23:48:14 2016
+++ src/bin/df/df.1 Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: df.1,v 1.46 2016/08/10 23:48:14 sevan Exp $
+.\" $NetBSD: df.1,v 1.46.6.1 2018/08/28 13:21:42 martin 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 10, 2016
+.Dd August 27, 2018
.Dt DF 1
.Os
.Sh NAME
@@ -37,8 +37,8 @@
.Nd display free disk space
.Sh SYNOPSIS
.Nm
-.Op Fl agklmn
-.Op Fl G | Fl i | Fl P
+.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.92.8.1
--- src/bin/df/df.c:1.92 Sat Mar 5 08:15:01 2016
+++ src/bin/df/df.c Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.92 2016/03/05 08:15:01 kamil Exp $ */
+/* $NetBSD: df.c,v 1.92.8.1 2018/08/28 13:21:42 martin 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.92.8.1 2018/08/28 13:21:42 martin 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);
Index: src/bin/ksh/ksh.Man
diff -u src/bin/ksh/ksh.Man:1.25 src/bin/ksh/ksh.Man:1.25.8.1
--- src/bin/ksh/ksh.Man:1.25 Wed Dec 30 22:26:26 2015
+++ src/bin/ksh/ksh.Man Tue Aug 28 13:21:42 2018
@@ -1,5 +1,5 @@
'\" t
-.\" $NetBSD: ksh.Man,v 1.25 2015/12/30 22:26:26 christos Exp $
+.\" $NetBSD: ksh.Man,v 1.25.8.1 2018/08/28 13:21:42 martin Exp $
.\"{{{}}}
.\"{{{ Notes about man page
.\" - use the pseudo-macros .sh( and .sh) to begin and end sh-specific
@@ -19,10 +19,10 @@
.\"}}}
.\"{{{ Title
.ksh(
-.TH KSH 1 "April 12, 2015" "" "User commands"
+.TH KSH 1 "August 26, 2018" "" "User commands"
.ksh)
.sh(
-.TH SH 1 "April 12, 2015" "" "User commands"
+.TH SH 1 "August 26, 2018" "" "User commands"
.sh)
.\"}}}
.\"{{{ Name
@@ -43,7 +43,7 @@ sh \- Public domain Bourne shell
.sh(
\fBsh\fP
.sh)
-[\fB\(+-abCefhikmnprsuvxX\fP] [\fB\(+-o\fP \fIoption\fP] [ [ \fB\-c\fP \fIcommand-string\fP [\fIcommand-name\fP] | \fB\-s\fP | \fIfile\fP ] [\fIargument\fP ...] ]
+[\fB\(+-abCefhiklmnprsuvxX\fP] [\fB\(+-o\fP \fIoption\fP] [ [ \fB\-c\fP \fIcommand-string\fP [\fIcommand-name\fP] | \fB\-s\fP | \fIfile\fP ] [\fIargument\fP ...] ]
.ad b
.\"}}}
.\"{{{ Description
Index: src/bin/ln/ln.c
diff -u src/bin/ln/ln.c:1.39 src/bin/ln/ln.c:1.39.4.1
--- src/bin/ln/ln.c:1.39 Sat Apr 22 12:22:31 2017
+++ src/bin/ln/ln.c Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ln.c,v 1.39 2017/04/22 12:22:31 kre Exp $ */
+/* $NetBSD: ln.c,v 1.39.4.1 2018/08/28 13:21:42 martin Exp $ */
/*-
* Copyright (c) 1987, 1993, 1994
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ln.c 8.2 (Be
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/bin/ln/ln.c 251261 2013-06-02 17:55:00Z eadler $");
#endif
-__RCSID("$NetBSD: ln.c,v 1.39 2017/04/22 12:22:31 kre Exp $");
+__RCSID("$NetBSD: ln.c,v 1.39.4.1 2018/08/28 13:21:42 martin Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -358,8 +358,8 @@ static __dead void
usage(void)
{
(void)fprintf(stderr,
- "usage: %s [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file [target_file]\n"
- " %s [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file ... target_dir\n"
+ "usage: %s [-L | -P | -s [-F]] [-f | -iw] [-hnv] source_file [target_file]\n"
+ " %s [-L | -P | -s [-F]] [-f | -iw] [-hnv] source_file ... target_dir\n"
" link source_file target_file\n", getprogname(), getprogname());
exit(1);
}
Index: src/external/bsd/top/dist/top.1.in
diff -u src/external/bsd/top/dist/top.1.in:1.10 src/external/bsd/top/dist/top.1.in:1.10.6.1
--- src/external/bsd/top/dist/top.1.in:1.10 Thu Jan 12 18:37:09 2017
+++ src/external/bsd/top/dist/top.1.in Tue Aug 28 13:21:42 2018
@@ -4,7 +4,7 @@
.nr D @DEFAULT_DELAY@
.nr L @HAVE_GETOPT_LONG@
.nr K @ENABLE_KILL@
-.TH TOP 1 "December 28, 2016"
+.TH TOP 1 "August 26, 2018"
.UC 4
.SH NAME
top \- display and update information about the top cpu processes
@@ -399,6 +399,9 @@ Current state (typically one of \*(lqsle
.B TIME
Number of system and user cpu seconds that the process has used.
.TP
+.B WCPU
+Weighted percentage of available cpu time used by this process.
+.TP
.B CPU
Percentage of available cpu time used by this process.
.TP
Index: src/sbin/amrctl/amrctl.c
diff -u src/sbin/amrctl/amrctl.c:1.10 src/sbin/amrctl/amrctl.c:1.10.18.1
--- src/sbin/amrctl/amrctl.c:1.10 Sun Mar 23 05:09:56 2014
+++ src/sbin/amrctl/amrctl.c Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amrctl.c,v 1.10 2014/03/23 05:09:56 dholland Exp $ */
+/* $NetBSD: amrctl.c,v 1.10.18.1 2018/08/28 13:21:42 martin Exp $ */
/*-
* Copyright (c) 2002, Pierre David <pierre.da...@crc.u-strasbg.fr>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: amrctl.c,v 1.10 2014/03/23 05:09:56 dholland Exp $");
+__RCSID("$NetBSD: amrctl.c,v 1.10.18.1 2018/08/28 13:21:42 martin Exp $");
#endif
#include <stdio.h>
@@ -192,11 +192,10 @@ static void
usage(const char *prog)
{
fprintf(stderr, "usage: %s stat [-a num] [-b] "
- "[-c ctlr|-f dev] [-g] [-l vol]\n\t\t"
+ "[-f dev] [-g] [-l vol]\n\t\t"
"[-p drive|-s bus[:target]] [-t usec] [-v]\n\n\t"
"-a num\t\tnumber of retries\n\t"
"-b\t\tbattery status\n\t"
- "-c ctrl\t\tcontroller ID\n\t"
"-f dev\t\tdevice path\n\t"
"-g\t\tprint global parameters\n\t"
"-l vol\t\tlogical volume ID\n\t"
@@ -603,7 +602,7 @@ main(int argc, char *argv[])
usage(argv[0]);
optind = 2;
- while ((i = getopt(argc, argv, "a:bc:f:gl:p:s:t:v")) != -1)
+ while ((i = getopt(argc, argv, "a:b:f:gl:p:s:t:v")) != -1)
switch (i) {
case 'a':
nattempts = atoi(optarg);
Index: src/sbin/fsck_ext2fs/fsck_ext2fs.8
diff -u src/sbin/fsck_ext2fs/fsck_ext2fs.8:1.20 src/sbin/fsck_ext2fs/fsck_ext2fs.8:1.20.6.1
--- src/sbin/fsck_ext2fs/fsck_ext2fs.8:1.20 Sun Sep 11 03:56:00 2016
+++ src/sbin/fsck_ext2fs/fsck_ext2fs.8 Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: fsck_ext2fs.8,v 1.20 2016/09/11 03:56:00 sevan Exp $
+.\" $NetBSD: fsck_ext2fs.8,v 1.20.6.1 2018/08/28 13:21:42 martin Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -51,7 +51,7 @@
.\"
.\" @(#)fsck.8 8.3 (Berkeley) 11/29/94
.\"
-.Dd September 11, 2016
+.Dd August 27, 2018
.Dt FSCK_EXT2FS 8
.Os
.Sh NAME
@@ -61,7 +61,6 @@
.Nm
.Op Fl dfnpUy
.Op Fl b Ar block#
-.Op Fl c Ar level
.Op Fl m Ar mode
.Ar filesystem ...
.Sh DESCRIPTION
Index: src/sbin/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.37 src/sbin/fsck_ext2fs/main.c:1.37.34.1
--- src/sbin/fsck_ext2fs/main.c:1.37 Thu Jun 9 19:57:51 2011
+++ src/sbin/fsck_ext2fs/main.c Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.37 2011/06/09 19:57:51 christos Exp $ */
+/* $NetBSD: main.c,v 1.37.34.1 2018/08/28 13:21:42 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -63,7 +63,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.37 2011/06/09 19:57:51 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.37.34.1 2018/08/28 13:21:42 martin Exp $");
#endif
#endif /* not lint */
@@ -349,7 +349,7 @@ usage(void)
{
(void) fprintf(stderr,
- "usage: %s [-dfnpUy] [-b block] [-c level] [-m mode] filesystem ...\n",
+ "usage: %s [-dfnpUy] [-b block] [-m mode] filesystem ...\n",
getprogname());
exit(FSCK_EXIT_USAGE);
}
Index: src/sbin/gpt/main.c
diff -u src/sbin/gpt/main.c:1.10.4.1 src/sbin/gpt/main.c:1.10.4.2
--- src/sbin/gpt/main.c:1.10.4.1 Mon Apr 9 12:54:00 2018
+++ src/sbin/gpt/main.c Tue Aug 28 13:21:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.10.4.1 2018/04/09 12:54:00 bouyer Exp $ */
+/* $NetBSD: main.c,v 1.10.4.2 2018/08/28 13:21:42 martin Exp $ */
/*-
* Copyright (c) 2002 Marcel Moolenaar
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: main.c,v 1.10.4.1 2018/04/09 12:54:00 bouyer Exp $");
+__RCSID("$NetBSD: main.c,v 1.10.4.2 2018/08/28 13:21:42 martin Exp $");
#endif
#include <stdio.h>
@@ -105,7 +105,7 @@ usage(void)
{
const char *p = getprogname();
const char *f =
- "[-nrqv] [-m mediasize] [-s sectorsize]";
+ "[-nrqv] [-m mediasize] [-s sectorsize] [-T timestamp]";
size_t i;
if (strcmp(p, "gpt") == 0)
