diff options
| author | Denys Vlasenko | 2021-07-02 23:24:52 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2021-07-02 23:26:09 +0200 |
| commit | 646429e05e2f62250da80aa8d98111f3a9818e9a (patch) | |
| tree | a7ce873385b5386fa3472c5d97f45db4c1f6977b | |
| parent | a5d7b0f4f4e9728c3eb7a06d38227d9f3351e677 (diff) | |
| download | busybox-646429e05e2f62250da80aa8d98111f3a9818e9a.zip busybox-646429e05e2f62250da80aa8d98111f3a9818e9a.tar.gz | |
awk: use smaller regmatch_t arrays, they had 2 elements for no apparent reason
function old new delta
exec_builtin 1479 1434 -45
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | editors/awk.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/editors/awk.c b/editors/awk.c index 9f14f0f..c06dd23 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -1937,7 +1937,7 @@ static int awk_split(const char *s, node *spl, char **slist) n++; /* at least one field will be there */ do { int l; - regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough... + regmatch_t pmatch[1]; l = strcspn(s, c+2); /* len till next NUL or \n */ if (regexec1_nonempty(icase ? spl->r.ire : spl->l.re, s, pmatch) == 0 @@ -2166,7 +2166,7 @@ static int ptest(node *pattern) static int awk_getline(rstream *rsm, var *v) { char *b; - regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough... + regmatch_t pmatch[1]; int size, a, p, pp = 0; int fd, so, eo, r, rp; char c, *m, *s; @@ -2473,7 +2473,7 @@ static NOINLINE var *exec_builtin(node *op, var *res) node *an[4]; var *av[4]; const char *as[4]; - regmatch_t pmatch[2]; + regmatch_t pmatch[1]; regex_t sreg, *re; node *spl; uint32_t isr, info; @@ -3533,6 +3533,8 @@ int awk_main(int argc UNUSED_PARAM, char **argv) parse_program(llist_pop(&list_e)); } #endif +//FIXME: preserve order of -e and -f +//TODO: implement -i LIBRARY and -E FILE too, they are easy-ish if (!(opt & (OPT_f | OPT_e))) { if (!*argv) bb_show_usage(); |