diff options
author | Kyle Evans <kevans@FreeBSD.org> | 2018-06-27 20:54:12 +0000 |
---|---|---|
committer | Kyle Evans <kevans@FreeBSD.org> | 2018-06-27 20:54:12 +0000 |
commit | 483c038a0019ac01d1898ab12d315f484765a034 (patch) | |
tree | ccc5187ce8fc05db02cfb38b5cb3e5370a1406f9 /usr.bin | |
parent | 057654644c6c985dadca0053aa398b73eaf8246c (diff) | |
download | src-483c038a0019ac01d1898ab12d315f484765a034.tar.gz src-483c038a0019ac01d1898ab12d315f484765a034.zip |
MFC r333122: seq(1): Provide some long options
These match GNU seq(1) names where applicable for compatibility purposes.
Notes
Notes:
svn path=/stable/11/; revision=335736
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/seq/seq.1 | 10 | ||||
-rw-r--r-- | usr.bin/seq/seq.c | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/usr.bin/seq/seq.1 b/usr.bin/seq/seq.1 index 176b17c3f5a9..61294c5491ea 100644 --- a/usr.bin/seq/seq.1 +++ b/usr.bin/seq/seq.1 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 12, 2016 +.Dd April 30, 2018 .Dt SEQ 1 .Os .Sh NAME @@ -72,7 +72,7 @@ The .Nm utility accepts the following options: .Bl -tag -width Ar -.It Fl f Ar format +.It Fl f Ar format , Fl -format Ar format Use a .Xr printf 3 style @@ -98,7 +98,7 @@ defined in .St -ansiC . The default is .Cm %g . -.It Fl s Ar string +.It Fl s Ar string , Fl -separator Ar string Use .Ar string to separate numbers. @@ -109,7 +109,7 @@ defined in .St -ansiC . The default is .Cm \en . -.It Fl t Ar string +.It Fl t Ar string , Fl -terminator Ar string Use .Ar string to terminate sequence of numbers. @@ -121,7 +121,7 @@ defined in This option is useful when the default separator does not contain a .Cm \en . -.It Fl w +.It Fl w , Fl -fixed-width Equalize the widths of all numbers by padding with zeros as necessary. This option has no effect with the .Fl f diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c index b8c3faef7bf1..6ac47a7601f1 100644 --- a/usr.bin/seq/seq.c +++ b/usr.bin/seq/seq.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> #include <errno.h> +#include <getopt.h> #include <math.h> #include <locale.h> #include <stdio.h> @@ -67,6 +68,15 @@ static int valid_format(const char *); static char *generate_format(double, double, double, int, char); static char *unescape(char *); +static const struct option long_opts[] = +{ + {"format", required_argument, NULL, 'f'}, + {"separator", required_argument, NULL, 's'}, + {"terminator", required_argument, NULL, 't'}, + {"equal-width", no_argument, NULL, 'w'}, + {NULL, no_argument, NULL, 0} +}; + /* * The seq command will print out a numeric sequence from 1, the default, * to a user specified upper limit by 1. The lower bound and increment @@ -97,7 +107,7 @@ main(int argc, char *argv[]) * least they trip up getopt(3). */ while ((optind < argc) && !numeric(argv[optind]) && - (c = getopt(argc, argv, "f:hs:t:w")) != -1) { + (c = getopt_long(argc, argv, "+f:hs:t:w", long_opts, NULL)) != -1) { switch (c) { case 'f': /* format (plan9) */ |