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

awk: fix compat issue found by gpm build

Browse Source 
function                                             old     new   delta
as_regex                                             105     131     +26
hash_find                                            247     233     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 26/-14)             Total: 12 bytes
This commit is contained in:
Denis Vlasenko
2009-03-15 22:20:31 +00:00
parent 9210a36495
commit 7a6766428e
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
editors/awk.c
View File

@@ -604,8 +604,8 @@ static void *hash_find(xhash *hash, const char *name)
hash_rebuild(hash);
l = strlen(name) + 1;
hi = xzalloc(sizeof(hash_item) + l);
memcpy(hi->name, name, l);
hi = xzalloc(sizeof(*hi) + l);
strcpy(hi->name, name);
idx = hashidx(name) % hash->csize;
hi->next = hash->items[idx];
@@ -1482,6 +1482,7 @@ static node *mk_splitter(const char *s, tsplitter *spl)
*/
static regex_t *as_regex(node *op, regex_t *preg)
{
int cflags;
var *v;
const char *s;
@@ -1490,7 +1491,17 @@ static regex_t *as_regex(node *op, regex_t *preg)
}
v = nvalloc(1);
s = getvar_s(evaluate(op, v));
xregcomp(preg, s, icase ? REG_EXTENDED | REG_ICASE : REG_EXTENDED);
cflags = icase ? REG_EXTENDED | REG_ICASE : REG_EXTENDED;
/* Testcase where REG_EXTENDED fails (unpaired '{'):
* echo Hi | awk 'gsub("@(samp|code|file)\{","");'
* gawk 3.1.5 eats this. We revert to ~REG_EXTENDED
* (maybe gsub is not supposed to use REG_EXTENDED?).
*/
if (regcomp(preg, s, cflags)) {
cflags &= ~REG_EXTENDED;
xregcomp(preg, s, cflags);
}
nvfree(v);
return preg;
}