From: jmc <jmc@openbsd.org>
Date: Mon, 18 Sep 2023 15:20:48 +0000 (+0000)
Subject: add --csv to usage(), and reformat it to match manual; while here,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=14c491193d52f3f9a6dd3b6870964a384fc5aaf6;p=openbsd

add --csv to usage(), and reformat it to match manual; while here,
reformat a lengthy line in awk.1;

ok millert
---

diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index e2d8208b6ce..047692773a1 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awk.1,v 1.65 2023/09/17 14:49:44 millert Exp $
+.\"	$OpenBSD: awk.1,v 1.66 2023/09/18 15:20:48 jmc Exp $
 .\"
 .\" Copyright (C) Lucent Technologies 1997
 .\" All Rights Reserved
@@ -22,7 +22,7 @@
 .\" ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 .\" THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 17 2023 $
+.Dd $Mdocdate: September 18 2023 $
 .Dt AWK 1
 .Os
 .Sh NAME
@@ -350,8 +350,8 @@ and
 .Pf / Ar re Ns /
 is a constant regular expression;
 any string (constant or variable) may be used
-as a regular expression, except in the position of an isolated regular expression
-in a pattern.
+as a regular expression,
+except in the position of an isolated regular expression in a pattern.
 .Pp
 A pattern may consist of two patterns separated by a comma;
 in this case, the action is performed for all lines
diff --git a/usr.bin/awk/main.c b/usr.bin/awk/main.c
index c6e2d074a95..f4a359dac7e 100644
--- a/usr.bin/awk/main.c
+++ b/usr.bin/awk/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.59 2023/09/17 14:49:44 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.60 2023/09/18 15:20:48 jmc Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -144,8 +144,9 @@ int main(int argc, char *argv[])
 	}
 
 	if (argc == 1) {
-		fprintf(stderr, "usage: %s [-safe] [-V] [-d[n]] [-F fs] "
-		    "[-v var=value] [prog | -f progfile]\n\tfile ...\n",
+		fprintf(stderr, "usage: %s [-safe] [-V] [-d[n]] "
+		    "[-f fs | --csv] [-v var=value]\n"
+		    "\t   [prog | -f progfile] file ...\n",
 		    cmdname);
 		exit(1);
 	}