X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=editors%2Fawk.c;h=16c871f8c851c297a9b00dc07e807e3de197be9b;hb=5d8843e451c01d8abfe6b5be772637310e9e581e;hp=cb54d2597e3ca46916f69d5d99b585d06323b9d6;hpb=5cf9a03b3f7b9feb08f4aa4fc36f036b2f00614d;p=oweals%2Fbusybox.git diff --git a/editors/awk.c b/editors/awk.c index cb54d2597..16c871f8c 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -4,20 +4,7 @@ * * Copyright (C) 2002 by Dmitry Zakharov * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ #include @@ -25,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +46,7 @@ typedef struct var_s { double number; char *string; union { - int aidx; /* func arg index (on compilation stage) */ + int aidx; /* func arg idx (for compilation stage) */ struct xhash_s *array; /* array ptr */ struct var_s *parent; /* for func args, ptr to actual parameter */ char **walker; /* list of array elements (for..in) */ @@ -405,7 +393,7 @@ static char * vValues = /* hash size may grow to these values */ #define FIRST_PRIME 61; static const unsigned int PRIMES[] = { 251, 1021, 4093, 16381, 65521 }; -static const unsigned int NPRIMES = sizeof(PRIMES) / sizeof(unsigned int); +enum { NPRIMES = sizeof(PRIMES) / sizeof(unsigned int) }; /* globals */ @@ -445,7 +433,7 @@ static void chain_group(void); static var *evaluate(node *, var *); static rstream *next_input_file(void); static int fmt_num(char *, int, const char *, double, int); -static int awk_exit(int) attribute_noreturn; +static int awk_exit(int) ATTRIBUTE_NORETURN; /* ---- error handling ---- */ @@ -462,7 +450,7 @@ static const char EMSG_UNDEF_FUNC[] = "Call to undefined function"; static const char EMSG_NO_MATH[] = "Math support is not compiled in"; #endif -static void syntax_error(const char * const message) attribute_noreturn; +static void syntax_error(const char * const message) ATTRIBUTE_NORETURN; static void syntax_error(const char * const message) { bb_error_msg_and_die("%s:%i: %s", programname, lineno, message); @@ -475,7 +463,7 @@ static void syntax_error(const char * const message) static unsigned int hashidx(const char *name) { - register unsigned int idx=0; + unsigned int idx=0; while (*name) idx = *name++ + (idx << 6) - idx; return idx; @@ -486,9 +474,9 @@ static xhash *hash_init(void) { xhash *newhash; - newhash = (xhash *)xcalloc(1, sizeof(xhash)); + newhash = (xhash *)xzalloc(sizeof(xhash)); newhash->csize = FIRST_PRIME; - newhash->items = (hash_item **)xcalloc(newhash->csize, sizeof(hash_item *)); + newhash->items = (hash_item **)xzalloc(newhash->csize * sizeof(hash_item *)); return newhash; } @@ -517,7 +505,7 @@ static void hash_rebuild(xhash *hash) return; newsize = PRIMES[hash->nprime++]; - newitems = (hash_item **)xcalloc(newsize, sizeof(hash_item *)); + newitems = (hash_item **)xzalloc(newsize * sizeof(hash_item *)); for (i=0; icsize; i++) { hi = hash->items[i]; @@ -547,8 +535,8 @@ static void *hash_find(xhash *hash, const char *name) if (++hash->nel / hash->csize > 10) hash_rebuild(hash); - l = bb_strlen(name) + 1; - hi = xcalloc(sizeof(hash_item) + l, 1); + l = strlen(name) + 1; + hi = xzalloc(sizeof(hash_item) + l); memcpy(hi->name, name, l); idx = hashidx(name) % hash->csize; @@ -572,7 +560,7 @@ static void hash_remove(xhash *hash, const char *name) while (*phi) { hi = *phi; if (strcmp(hi->name, name) == 0) { - hash->glen -= (bb_strlen(name) + 1); + hash->glen -= (strlen(name) + 1); hash->nel--; *phi = hi->next; free(hi); @@ -586,7 +574,7 @@ static void hash_remove(xhash *hash, const char *name) static void skip_spaces(char **s) { - register char *p = *s; + char *p = *s; while(*p == ' ' || *p == '\t' || (*p == '\\' && *(p+1) == '\n' && (++p, ++t.lineno))) { @@ -597,7 +585,7 @@ static void skip_spaces(char **s) static char *nextword(char **s) { - register char *p = *s; + char *p = *s; while (*(*s)++) ; @@ -606,7 +594,7 @@ static char *nextword(char **s) static char nextchar(char **s) { - register char c, *pps; + char c, *pps; c = *((*s)++); pps = *s; @@ -698,7 +686,7 @@ static var *setvar_u(var *v, const char *value) /* set array element to user string */ static void setari_u(var *a, int idx, const char *s) { - register var *v; + var *v; static char sidx[12]; sprintf(sidx, "%d", idx); @@ -961,7 +949,7 @@ static uint32_t next_token(uint32_t expected) *(p-1) = '\0'; tc = TC_VARIABLE; /* also consume whitespace between functionname and bracket */ - skip_spaces(&p); + if (! (expected & TC_VARIABLE)) skip_spaces(&p); if (*p == '(') { tc = TC_FUNCTION; } else { @@ -1003,9 +991,9 @@ static void rollback_token(void) { t.rollback = TRUE; } static node *new_node(uint32_t info) { - register node *n; + node *n; - n = (node *)xcalloc(sizeof(node), 1); + n = (node *)xzalloc(sizeof(node)); n->info = info; n->lineno = lineno; return n; @@ -1107,7 +1095,7 @@ static node *parse_expr(uint32_t iexp) case TC_NUMBER: case TC_STRING: cn->info = OC_VAR; - v = cn->l.v = xcalloc(sizeof(var), 1); + v = cn->l.v = xzalloc(sizeof(var)); if (tc & TC_NUMBER) setvar_i(v, t.number); else @@ -1116,7 +1104,7 @@ static node *parse_expr(uint32_t iexp) case TC_REGEXP: mk_re_node(t.string, cn, - (regex_t *)xcalloc(sizeof(regex_t),2)); + (regex_t *)xzalloc(sizeof(regex_t)*2)); break; case TC_FUNCTION: @@ -1148,7 +1136,7 @@ static node *parse_expr(uint32_t iexp) /* add node to chain. Return ptr to alloc'd node */ static node *chain_node(uint32_t info) { - register node *n; + node *n; if (! seq->first) seq->first = seq->last = new_node(0); @@ -1367,7 +1355,7 @@ static void parse_program(char *p) static node *mk_splitter(char *s, tsplitter *spl) { - register regex_t *re, *ire; + regex_t *re, *ire; node *n; re = &spl->re[0]; @@ -1377,7 +1365,7 @@ static node *mk_splitter(char *s, tsplitter *spl) regfree(re); regfree(ire); } - if (bb_strlen(s) > 1) { + if (strlen(s) > 1) { mk_re_node(s, n, re); } else { n->info = (uint32_t) *s; @@ -1445,7 +1433,7 @@ static int awk_split(char *s, node *spl, char **slist) regmatch_t pmatch[2]; /* in worst case, each char would be a separate field */ - *slist = s1 = bb_xstrndup(s, bb_strlen(s) * 2 + 3); + *slist = s1 = bb_xstrndup(s, strlen(s) * 2 + 3); c[0] = c[1] = (char)spl->info; c[2] = c[3] = '\0'; @@ -1540,12 +1528,12 @@ static void handle_special(var *v) /* recalculate $0 */ sep = getvar_s(V[OFS]); - sl = bb_strlen(sep); + sl = strlen(sep); b = NULL; len = 0; for (i=0; ix.walker); v->type |= VF_WALK; - w = v->x.walker = (char **)xcalloc(2 + 2*sizeof(char *) + array->glen, 1); + w = v->x.walker = (char **)xzalloc(2 + 2*sizeof(char *) + array->glen); *w = *(w+1) = (char *)(w + 2); for (i=0; icsize; i++) { hi = array->items[i]; @@ -1669,6 +1657,7 @@ static int awk_getline(rstream *rsm, var *v) } } else if (c != '\0') { s = strchr(b+pp, c); + if (! s) s = memchr(b+pp, '\0', p - pp); if (s) { so = eo = s-b; eo++; @@ -1781,7 +1770,7 @@ static char *awk_printf(node *n) } else if (c == 's') { s1 = getvar_s(arg); - qrealloc(&b, incr+i+bb_strlen(s1), &bsize); + qrealloc(&b, incr+i+strlen(s1), &bsize); i += sprintf(b+i, s, s1); } else { @@ -1821,7 +1810,7 @@ static int awk_sub(node *rn, char *repl, int nm, var *src, var *dest, int ex) i = di = 0; sp = getvar_s(src); - rl = bb_strlen(repl); + rl = strlen(repl); while (regexec(re, sp, 10, pmatch, sp==getvar_s(src) ? 0:REG_NOTBOL) == 0) { so = pmatch[0].rm_so; eo = pmatch[0].rm_eo; @@ -1934,7 +1923,7 @@ static var *exec_builtin(node *op, var *res) break; case B_ss: - l = bb_strlen(as[0]); + l = strlen(as[0]); i = getvar_i(av[1]) - 1; if (i>l) i=l; if (i<0) i=0; n = (nargs > 2) ? getvar_i(av[2]) : l-i; @@ -1962,8 +1951,8 @@ lo_cont: case B_ix: n = 0; - ll = bb_strlen(as[1]); - l = bb_strlen(as[0]) - ll; + ll = strlen(as[1]); + l = strlen(as[0]) - ll; if (ll > 0 && l >= 0) { if (! icase) { s = strstr(as[0], as[1]); @@ -2365,12 +2354,12 @@ re_cont: case F_le: if (! op1) L.s = getvar_s(V[F0]); - R.d = bb_strlen(L.s); + R.d = strlen(L.s); break; case F_sy: fflush(NULL); - R.d = (L.s && *L.s) ? system(L.s) : 0; + R.d = (L.s && *L.s) ? (system(L.s) >> 8) : 0; break; case F_ff: @@ -2453,12 +2442,12 @@ re_cont: /* concatenation (" ") and index joining (",") */ case XC( OC_CONCAT ): case XC( OC_COMMA ): - opn = bb_strlen(L.s) + bb_strlen(R.s) + 2; + opn = strlen(L.s) + strlen(R.s) + 2; X.s = (char *)xmalloc(opn); strcpy(X.s, L.s); if ((opinfo & OPCLSMASK) == OC_COMMA) { L.s = getvar_s(V[SUBSEP]); - X.s = (char *)xrealloc(X.s, opn + bb_strlen(L.s)); + X.s = (char *)xrealloc(X.s, opn + strlen(L.s)); strcat(X.s, L.s); } strcat(X.s, R.s); @@ -2624,10 +2613,10 @@ static rstream *next_input_file(void) return &rsm; } -extern int awk_main(int argc, char **argv) +int awk_main(int argc, char **argv) { char *s, *s1; - int i, j, c; + int i, j, c, flen; var *v; static var tv; char **envp; @@ -2695,9 +2684,16 @@ keep_going: F = afopen(programname = optarg, "r"); s = NULL; /* one byte is reserved for some trick in next_token */ - for (i=j=1; j>0; i+=j) { - s = (char *)xrealloc(s, i+4096); - j = fread(s+i, 1, 4094, F); + if (fseek(F, 0, SEEK_END) == 0) { + flen = ftell(F); + s = (char *)xmalloc(flen+4); + fseek(F, 0, SEEK_SET); + i = 1 + fread(s+1, 1, flen, F); + } else { + for (i=j=1; j>0; i+=j) { + s = (char *)xrealloc(s, i+4096); + j = fread(s+i, 1, 4094, F); + } } s[i] = '\0'; fclose(F);