Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src Pull up following revision(s) (requested by sevan in tick...



details:   https://anonhg.NetBSD.org/src/rev/58a9294a210e
branches:  netbsd-8
changeset: 435220:58a9294a210e
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Aug 28 13:21:42 2018 +0000

description:
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()

diffstat:

 bin/df/df.1                    |  8 ++++----
 bin/df/df.c                    |  6 +++---
 bin/ksh/ksh.Man                |  8 ++++----
 bin/ln/ln.c                    |  8 ++++----
 external/bsd/top/dist/top.1.in |  5 ++++-
 sbin/amrctl/amrctl.c           |  9 ++++-----
 sbin/fsck_ext2fs/fsck_ext2fs.8 |  5 ++---
 sbin/fsck_ext2fs/main.c        |  6 +++---
 sbin/gpt/main.c                |  6 +++---
 9 files changed, 31 insertions(+), 30 deletions(-)

diffs (259 lines):

diff -r 04e49e9acf59 -r 58a9294a210e bin/df/df.1
--- a/bin/df/df.1       Mon Aug 27 07:50:41 2018 +0000
+++ b/bin/df/df.1       Tue Aug 28 13:21:42 2018 +0000
@@ -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
diff -r 04e49e9acf59 -r 58a9294a210e bin/df/df.c
--- a/bin/df/df.c       Mon Aug 27 07:50:41 2018 +0000
+++ b/bin/df/df.c       Tue Aug 28 13:21:42 2018 +0000
@@ -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 @@
 #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 @@
 {
 
        (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);
diff -r 04e49e9acf59 -r 58a9294a210e bin/ksh/ksh.Man
--- a/bin/ksh/ksh.Man   Mon Aug 27 07:50:41 2018 +0000
+++ b/bin/ksh/ksh.Man   Tue Aug 28 13:21:42 2018 +0000
@@ -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(
 \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
diff -r 04e49e9acf59 -r 58a9294a210e bin/ln/ln.c
--- a/bin/ln/ln.c       Mon Aug 27 07:50:41 2018 +0000
+++ b/bin/ln/ln.c       Tue Aug 28 13:21:42 2018 +0000
@@ -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 @@
 #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 @@
 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);
 }
diff -r 04e49e9acf59 -r 58a9294a210e external/bsd/top/dist/top.1.in
--- a/external/bsd/top/dist/top.1.in    Mon Aug 27 07:50:41 2018 +0000
+++ b/external/bsd/top/dist/top.1.in    Tue Aug 28 13:21:42 2018 +0000
@@ -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 @@
 .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
diff -r 04e49e9acf59 -r 58a9294a210e sbin/amrctl/amrctl.c
--- a/sbin/amrctl/amrctl.c      Mon Aug 27 07:50:41 2018 +0000
+++ b/sbin/amrctl/amrctl.c      Tue Aug 28 13:21:42 2018 +0000
@@ -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.David%crc.u-strasbg.fr@localhost>
@@ -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 @@
 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 @@
                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);
diff -r 04e49e9acf59 -r 58a9294a210e sbin/fsck_ext2fs/fsck_ext2fs.8
--- a/sbin/fsck_ext2fs/fsck_ext2fs.8    Mon Aug 27 07:50:41 2018 +0000
+++ b/sbin/fsck_ext2fs/fsck_ext2fs.8    Tue Aug 28 13:21:42 2018 +0000
@@ -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
diff -r 04e49e9acf59 -r 58a9294a210e sbin/fsck_ext2fs/main.c
--- a/sbin/fsck_ext2fs/main.c   Mon Aug 27 07:50:41 2018 +0000
+++ b/sbin/fsck_ext2fs/main.c   Tue Aug 28 13:21:42 2018 +0000
@@ -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 @@
 #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 @@
 {
 
        (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);
 }
diff -r 04e49e9acf59 -r 58a9294a210e sbin/gpt/main.c
--- a/sbin/gpt/main.c   Mon Aug 27 07:50:41 2018 +0000
+++ b/sbin/gpt/main.c   Tue Aug 28 13:21:42 2018 +0000
@@ -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 @@
 {
        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)



Home | Main Index | Thread Index | Old Index