emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awk: style fixes; remove one xstrdup/free pair; testsuite

Browse Source
This commit is contained in:
Denis Vlasenko 2007-07-18 18:31:11 +00:00
parent 91afdf8096
commit b78c782c85
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
editors/awk.c
View File

@ -600,7 +600,7 @@ static void *hash_find(xhash *hash, const char *name)
int l; int l;
hi = hash_search(hash, name); hi = hash_search(hash, name);
if (! hi) { if (!hi) {
if (++hash->nel / hash->csize > 10) if (++hash->nel / hash->csize > 10)
hash_rebuild(hash); hash_rebuild(hash);
@ -1339,7 +1339,7 @@ static void chain_group(void)
n3 = parse_expr(TC_SEQTERM); n3 = parse_expr(TC_SEQTERM);
n = chain_loop(n3); n = chain_loop(n3);
n->l.n = n2; n->l.n = n2;
if (! n2) if (!n2)
n->info = OC_EXEC; n->info = OC_EXEC;
} }
break; break;
@ -1446,7 +1446,7 @@ static node *mk_splitter(const char *s, tsplitter *spl)
n = &spl->n; n = &spl->n;
if ((n->info & OPCLSMASK) == OC_REGEXP) { if ((n->info & OPCLSMASK) == OC_REGEXP) {
regfree(re); regfree(re);
regfree(ire); regfree(ire); // TODO: nuke ire, use re+1?
} }
if (strlen(s) > 1) { if (strlen(s) > 1) {
mk_re_node(s, n, re); mk_re_node(s, n, re);
@ -1511,7 +1511,7 @@ static int awk_split(const char *s, node *spl, char **slist)
int l, n = 0; int l, n = 0;
char c[4]; char c[4];
char *s1; char *s1;
regmatch_t pmatch[2]; regmatch_t pmatch[2]; // TODO: why [2]? [1] is enough...
/* in worst case, each char would be a separate field */ /* in worst case, each char would be a separate field */
*slist = s1 = xzalloc(strlen(s) * 2 + 3); *slist = s1 = xzalloc(strlen(s) * 2 + 3);
@ -1732,7 +1732,7 @@ static int awk_getline(rstream *rsm, var *v)
c = (char) rsplitter.n.info; c = (char) rsplitter.n.info;
rp = 0; rp = 0;
if (! m) qrealloc(&m, 256, &size); if (!m) qrealloc(&m, 256, &size);
do { do {
b = m + a; b = m + a;
so = eo = p; so = eo = p;
@ -1748,7 +1748,7 @@ static int awk_getline(rstream *rsm, var *v)
} }
} else if (c != '\0') { } else if (c != '\0') {
s = strchr(b+pp, c); s = strchr(b+pp, c);
if (! s) s = memchr(b+pp, '\0', p - pp); if (!s) s = memchr(b+pp, '\0', p - pp);
if (s) { if (s) {
so = eo = s-b; so = eo = s-b;
eo++; eo++;
@ -1900,8 +1900,8 @@ static int awk_sub(node *rn, const char *repl, int nm, var *src, var *dest, int
regex_t sreg, *re; regex_t sreg, *re;
re = as_regex(rn, &sreg); re = as_regex(rn, &sreg);
if (! src) src = intvar[F0]; if (!src) src = intvar[F0];
if (! dest) dest = intvar[F0]; if (!dest) dest = intvar[F0];
i = di = 0; i = di = 0;
sp = getvar_s(src); sp = getvar_s(src);
@ -1946,7 +1946,8 @@ static int awk_sub(node *rn, const char *repl, int nm, var *src, var *dest, int
sp += eo; sp += eo;
if (i == nm) break; if (i == nm) break;
if (eo == so) { if (eo == so) {
if (! (ds[di++] = *sp++)) break; ds[di] = *sp++;
if (!ds[di++]) break;
} }
} }
@ -2797,13 +2798,16 @@ int awk_main(int argc, char **argv)
/* Huh, people report that sometimes environ is NULL. Oh well. */ /* Huh, people report that sometimes environ is NULL. Oh well. */
if (environ) for (envp = environ; *envp; envp++) { if (environ) for (envp = environ; *envp; envp++) {
char *s = xstrdup(*envp); /* environ is writable, thus we don't strdup it needlessly */
char *s = *envp;
char *s1 = strchr(s, '='); char *s1 = strchr(s, '=');
if (s1) { if (s1) {
*s1++ = '\0'; *s1 = '\0';
setvar_u(findvar(iamarray(intvar[ENVIRON]), s), s1); /* Both findvar and setvar_u take const char*
* as 2nd arg -> environment is not trashed */
setvar_u(findvar(iamarray(intvar[ENVIRON]), s), s1 + 1);
*s1 = '=';
} }
free(s);
} }
opt_complementary = "v::"; opt_complementary = "v::";
opt = getopt32(argc, argv, "F:v:f:W:", &opt_F, &opt_v, &g_progname, &opt_W); opt = getopt32(argc, argv, "F:v:f:W:", &opt_F, &opt_v, &g_progname, &opt_W);