table

чување e8e571c732c832c78f044bc5db3b6374fc4c6538
родитељ 9ad6c46a15cb4b08ff314606d132bc7a8462277d
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Tue, 30 Apr 2024 15:48:26 +0200

Correct synopsis syntax (also in -h); convert example to POSIX sed

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
README
 | 
2
+-
M
table.1.in
 | 
18
++++++++++--------
M
table.c
 | 
14
+++++++-------

измењених датотека: 3, додавања: 18(+), брисања: 16(-)
diff --git a/README b/README
@@ -17,7 +17,7 @@ mounted Linux-style /proc file system)
 Format a long list of files in the current directory in a double line table with
 single-line column divisors
 
-	$ LC_ALL=C ls -l | tail -n +2 | sed -e 's/ \+/ /g' | table -d ' ' -n
+	$ LC_ALL=C ls -l | tail -n +2 | sed -E 's/ +/ /g' | table -d ' ' -n
 
 Print information from /etc/passwd in a table:
 
diff --git a/table.1.in b/table.1.in
@@ -12,15 +12,17 @@
 .Fl h | \-help | Fl V | \-full\-version | Fl v | \-version
 .sp 1
 .Nm
-.Oo Fl bDHmnpty | Fl a Ar alignment | Fl c Ar cols | Fl d Ar delim |
-.Fl f Ar format | Fl q Ar behavior | Fl s Ar set Oc Op Ar pathname
+.Oo Fl bDHmnpty Oc Oo Fl a Ar alignment Oc Oo Fl c Ar cols Oc
+.Oo Fl d Ar delim Oc Oo Fl f Ar format Oc Oo Fl q Ar behavior Oc
+.Oo Fl s Ar set Oc Op Ar pathname
 .sp 1
 .Nm
-.Oo Fl "\-align=" Ns Ar alignment | Fl \-border\-mode |
-.Fl \-columns= Ns Ar cols | Fl \-align\-dot | Fl \-delimiter= Ns Ar delim |
-.Fl \-format= Ns Ar format | Fl \-align\-header | Fl \-msdos | Fl \-no\-ansi |
-.Fl \-pause | Fl \-quotes= Ns Ar behavior | Fl \-symbols= Ns Ar set |
-.Fl \-expand\-tabs | Fl \-yes\-ansi Oc Op Ar pathname
+.Oo Fl "\-align=" Ns Ar alignment Oc Oo Fl \-border\-mode Oc
+.Oo Fl \-columns= Ns Ar cols Oc Oo Fl \-align\-dot Oc
+.Oo Fl \-delimiter= Ns Ar delim Oc Oo Fl \-format= Ns Ar format Oc
+.Oq Fl \-align\-header Oq Fl \-msdos Oq Fl \-no\-ansi Oq Fl \-pause
+.Oo Fl \-quotes= Ns Ar behavior Oc Oo Fl \-symbols= Ns Ar set Oc
+.Oq Fl \-expand\-tabs Oq Fl \-yes\-ansi Op Ar pathname
 .Ss Command aliases
 .Nm tablep
 is a synonym for
@@ -247,7 +249,7 @@ $ watch \[dq]table /proc/loadavg -d ' ' -c 50 -n -s ss\[dq]
 Format a long list of files in the current directory in a double line table with
 single\-line column divisors
 .Bd -literal -offset 0
-$ LC_ALL=C ls -l | tail -n +2 | sed -e 's/ \\+/ /g' | table -d ' ' -n
+$ LC_ALL=C ls -l | tail -n +2 | sed -E 's/ +/ /g' | table -d ' ' -n
 .Ed
 .It
 Print information from
diff --git a/table.c b/table.c
@@ -109,13 +109,13 @@ int
 usage(void)
 {
 	printf("Usage:\t%s -h | --help | -V | --full-version | -v | --version\n"
-	       "\t%s [-bDHmnpty | -a <alignment> | -c <cols> | -d <delim> |"
-	       " -f <format> | -q <behavior> | -s <set>] [pathname]\n"
-	       "\t%s [--align=<alignment> | --border-mode | --columns=<cols> |"
-	       " --align-dot | --delimiter=<delim> |  --format=<format> |"
-	       " --align-header | --msdos | --no-ansi | --pause |"
-	       " --quotes=<behavior> | --symbols=<set> | --expand-tabs |"
-	       " --yes-ansi] [pathname]\n",
+	       "\t%s [-bDHmnpty] [-a <alignment>] [-c <cols>] [-d <delim>]"
+	       " [-f <format>] [-q <behavior>] [-s <set>] [pathname]\n"
+	       "\t%s [--align=<alignment>] [--border-mode] [--columns=<cols>]"
+	       " [--align-dot] [--delimiter=<delim>] [--format=<format>]"
+	       " [--align-header] [--msdos] [--no-ansi] [--pause]"
+	       " [--quotes=<behavior>] [--symbols=<set>] [--expand-tabs]"
+	       " [--yes-ansi] [pathname]\n",
 		PROGRAMNAME, PROGRAMNAME, PROGRAMNAME);
 	return 0;
 }