Module Name: src
Committed By: wiz
Date: Mon Oct 2 08:23:23 UTC 2017
Modified Files:
src/usr.bin/tail: tail.1 tail.c
Log Message:
Sort options.
-qv are not specific to -r, so separate them.
Add -q and -v descriptions to the general option table.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/tail/tail.1 src/usr.bin/tail/tail.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tail/tail.1
diff -u src/usr.bin/tail/tail.1:1.18 src/usr.bin/tail/tail.1:1.19
--- src/usr.bin/tail/tail.1:1.18 Sun Oct 1 20:49:24 2017
+++ src/usr.bin/tail/tail.1 Mon Oct 2 08:23:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: tail.1,v 1.18 2017/10/01 20:49:24 maya Exp $
+.\" $NetBSD: tail.1,v 1.19 2017/10/02 08:23:23 wiz Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -40,10 +40,11 @@
.Nd display the last part of a file
.Sh SYNOPSIS
.Nm
+.Fl qv
.Oo
.Fl f |
.Fl F |
-.Fl rqv
+.Fl r
.Oc
.Oo
.Fl b Ar number |
@@ -113,6 +114,9 @@ or similar programs.
The location is
.Ar number
lines.
+.It Fl q
+Do not prepend a header for each file, even if multiple files
+are specified.
.It Fl r
The
.Fl r
@@ -131,6 +135,8 @@ from the beginning or end of the input f
The default for the
.Fl r
option is to display all of the input.
+.It Fl v
+Prepend each file with a header.
.El
.Pp
If more than a single file is specified, or the
Index: src/usr.bin/tail/tail.c
diff -u src/usr.bin/tail/tail.c:1.18 src/usr.bin/tail/tail.c:1.19
--- src/usr.bin/tail/tail.c:1.18 Sun Oct 1 20:49:24 2017
+++ src/usr.bin/tail/tail.c Mon Oct 2 08:23:23 2017
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tail.c,v 1.18 2017/10/01 20:49:24 maya Exp $");
+__RCSID("$NetBSD: tail.c,v 1.19 2017/10/02 08:23:23 wiz Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -317,7 +317,7 @@ static void
usage(void)
{
(void)fprintf(stderr,
- "Usage: %s [-f | -F | -rqv] [-b # | -c # | -n #] [file ...]\n",
+ "Usage: %s [-qv] [-f | -F | -r] [-b # | -c # | -n #] [file ...]\n",
getprogname());
exit(1);
}
