Is its section feature actually used? I wrote nl sans it: # HG changeset patch # User Strake # Date 1374880988 18000 # Node ID 33fe2af56d2d80f2cc9ecd26a173b1f718e1f721 # Parent 16ed6e15cd35c0d9798150e769de3155dc6a2e9b add nl
diff -r 16ed6e15cd35 -r 33fe2af56d2d toys/pending/nl.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/toys/pending/nl.c Fri Jul 26 18:23:08 2013 -0500 @@ -0,0 +1,101 @@ +/* nl.c - print line numbers + * + * Copyright 2013 CE Strake <strake...@gmail.com> + * + * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ + * See http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/cmdbehav.html + +USE_NL(NEWTOY(nl, "Eb:n:s:w#", TOYFLAG_BIN)) + +config NL + bool "nl" + default n + help + usage: nl [-E] [-b mode] [-n (r|l)(n|z)] [-s separator] [-w width] + + modes: give numbers to + a: all lines + t: non-empty lines + n: no lines + pRE: lines what match regex RE + + flags: + E: extended RE syntax +*/ + +#define FOR_nl +#include "toys.h" +#include <regex.h> + +GLOBALS( + long wArgu; + char *sArgu, *nArgu, *bArgu, *re_xs; + char fmt[5]; +) + +char s = '\t'; +long width = 6; +regex_t re; /* fails in GLOBALS */ + +void do_nl (int fd, char *name) { + char *x; + FILE *f; + long n = 0; + + f = fdopen (fd, "r"); + if (!f) perror_exit ("failed to open %s", name); + + x = 0; + for (;;) { + size_t l; + if (getline (&x, &l, f) < 0) { + if (feof (f)) break; + perror_exit ("failed to read"); + } + if (TT.re_xs && regexec (&re, x, 0, 0, 0) == 0) printf (TT.fmt, width, ++n); + printf ("%c%s", s, x); + } + + free (x); + fclose (f); +} + +void nl_main (void) { + if (toys.optflags & FLAG_w) width = TT.wArgu; + + if (TT.sArgu) s = TT.sArgu[0]; + + if (!TT.nArgu) TT.nArgu = "rn"; + + if (TT.bArgu) switch (TT.bArgu[0]) { + case 'a': + TT.re_xs = ""; + break; + case 't': + TT.re_xs = ".\n"; + break; + case 'n': + TT.re_xs = 0; + break; + case 'p': + TT.re_xs = TT.bArgu + 1; + break; + default: + error_exit ("bad mode: %c", TT.bArgu[0]); + } + else TT.re_xs = ".\n"; + + if (TT.re_xs && + regcomp (&re, TT.re_xs, + REG_NOSUB | + (toys.optflags & FLAG_E ? REG_EXTENDED : 0)) != 0) { + error_exit ("bad RE"); + } + + strcpy (TT.fmt, "%"); + if (TT.nArgu[0] == 'l') strcat (TT.fmt, "-"); + if (TT.nArgu[1] == 'z') strcat (TT.fmt, "0"); + strcat (TT.fmt, "*d"); + + loopfiles (toys.optargs, do_nl); +} _______________________________________________ Toybox mailing list Toybox@lists.landley.net http://lists.landley.net/listinfo.cgi/toybox-landley.net
