fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement nl -n format

Browse Source
This commit is contained in:
sin
2015-02-20 14:12:03 +00:00
parent b8fbaa9b0d
commit cd51795423
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nl.c
View File

@@ -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;