sbase

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

commit cd517954232a260f7ee83600904225d1bd3572b6
parent b8fbaa9b0d95c3f7270a7e633fc429fe1c0ea7b3
Author: sin <sin@2f30.org>
Date:   Fri Feb 20 14:12:03 +0000

Implement nl -n format

Diffstat:
README | 2+-
nl.1 | 18++++++++++++++++++
nl.c | 20++++++++++++++++++--
3 files changed, 37 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 += nl no -d, -f, -h, -l, -p =* nohup yes none #* paste yes none =* printenv non-posix none diff --git a/nl.1 b/nl.1 @@ -8,6 +8,7 @@ .Nm .Op Fl b Ar type .Op Fl i Ar incr +.Op Fl n Ar format .Op Fl s Ar sep .Op Fl v Ar startnum .Op Fl w Ar width @@ -40,6 +41,23 @@ a regular expression as defined in .El .It Fl i Ar incr Defines the increment between numbered lines. +.It Fl n Ar format +Specify the line number output format. +The +.Ar format +can be any of the following: +.Bl -tag -width pstringXX +.It ln +Left justified. +.It rn +Right justified. +.It rz +Right justified with leading zeroes. +.El +.Pp +The default +.Ar format +is rn. .It Fl s Ar sep Defines the string used to separate line numbers and lines. By default this is a tab. diff --git a/nl.c b/nl.c @@ -8,7 +8,12 @@ #include "text.h" #include "util.h" +#define FORMAT_LN "%-*ld%s%s" +#define FORMAT_RN "%*ld%s%s" +#define FORMAT_RZ "%0*ld%s%s" + static char mode = 't'; +static const char *format = FORMAT_RN; static const char *sep = "\t"; static int width = 6; static size_t startnum = 1; @@ -25,7 +30,7 @@ nl(const char *name, FILE *fp) if ((mode == 'a') || (mode == 'p' && !regexec(&preg, buf, 0, NULL, 0)) || (mode == 't' && buf[0] != '\n')) { - printf("%*ld%s%s", width, startnum, sep, buf); + printf(format, width, startnum, sep, buf); startnum += incr; } else { printf(" %s", buf); @@ -39,7 +44,7 @@ nl(const char *name, FILE *fp) static void usage(void) { - eprintf("usage: %s [-b type] [-i incr] [-s sep] [-v startnum] [-w width] [file]\n", argv0); + eprintf("usage: %s [-b type] [-i incr] [-n format] [-s sep] [-v startnum] [-w width] [file]\n", argv0); } int @@ -60,6 +65,17 @@ main(int argc, char *argv[]) case 'i': incr = estrtonum(EARGF(usage()), 0, MIN(LLONG_MAX, SIZE_MAX)); break; + case 'n': + format = EARGF(usage()); + if (!strcmp(format, "ln")) + format = FORMAT_LN; + else if (!strcmp(format, "rn")) + format = FORMAT_RN; + else if (!strcmp(format, "rz")) + format = FORMAT_RZ; + else + eprintf("%s: bad format\n", format); + break; case 's': sep = EARGF(usage()); break;