sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit 9de3546082bcf80a09f10d169cad26ef1652bd93
parent 13e4231f4cbb3c981a2948ecc1971dcd75d8764d
Author: sin <sin@2f30.org>
Date:   Fri Feb 20 12:15:43 +0000

Implement nl -w width

Diffstat:
README | 2+-
nl.1 | 6++++++
nl.c | 8++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/README b/README @@ -48,7 +48,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support, =* mktemp non-posix none =* mv yes none (-i) =* nice yes none -= nl no -d, -f, -h, -l, -n, -p, -w += nl no -d, -f, -h, -l, -n, -p =* nohup yes none #* paste yes none =* printenv non-posix none diff --git a/nl.1 b/nl.1 @@ -10,6 +10,7 @@ .Op Fl i Ar incr .Op Fl s Ar sep .Op Fl v Ar startnum +.Op Fl w Ar width .Op Ar file .Sh DESCRIPTION .Nm @@ -46,6 +47,11 @@ a tab. Start counting from .Ar startnum instead of the default 1. +.It Fl w Ar width +The number of characters to be occupied by the line number +will be set to +.Ar width . +The default is 6. .El .Sh SEE ALSO .Xr pr 1 diff --git a/nl.c b/nl.c @@ -9,6 +9,7 @@ static char mode = 't'; static const char *sep = "\t"; +static int width = 6; static size_t startnum = 1; static size_t incr = 1; static regex_t preg; @@ -23,7 +24,7 @@ nl(const char *name, FILE *fp) if ((mode == 'a') || (mode == 'p' && !regexec(&preg, buf, 0, NULL, 0)) || (mode == 't' && buf[0] != '\n')) { - printf("%6ld%s%s", startnum, sep, buf); + printf("%*ld%s%s", width, startnum, sep, buf); startnum += incr; } else { printf(" %s", buf); @@ -37,7 +38,7 @@ nl(const char *name, FILE *fp) static void usage(void) { - eprintf("usage: %s [-b type] [-i incr] [-s sep] [-v startnum] [file]\n", argv0); + eprintf("usage: %s [-b type] [-i incr] [-s sep] [-v startnum] [-w width] [file]\n", argv0); } int @@ -64,6 +65,9 @@ main(int argc, char *argv[]) case 'v': startnum = estrtonum(EARGF(usage()), 0, MIN(LLONG_MAX, SIZE_MAX)); break; + case 'w': + width = estrtonum(EARGF(usage()), 1, INT_MAX); + break; default: usage(); } ARGEND;