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

xbps-checkvers: only allocate if $ is in the current line

Browse Source 
Before this commit, it would have seen $ from following lines
and thinks it needs to substitute variables.
This commit is contained in:
Duncaen 2019-06-13 22:55:30 +02:00 committed by Duncan Overbruck
parent 0691054a59
commit 684d2a7187
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/xbps-checkvers/main.c
View File

@ -468,7 +468,7 @@ rcv_get_pkgver(rcv_t *rcv)
size_t klen, vlen; size_t klen, vlen;
map_item_t _item; map_item_t _item;
map_item_t *item = NULL; map_item_t *item = NULL;
char c, *ptr = rcv->ptr, *e, *p, *k, *v, *comment; char c, *ptr = rcv->ptr, *e, *p, *k, *v, *comment, *d;
uint8_t vars = 0; uint8_t vars = 0;
while ((c = *ptr) != '\0') { while ((c = *ptr) != '\0') {
@ -523,18 +523,18 @@ rcv_get_pkgver(rcv_t *rcv)
} }
_item = map_add_n(rcv->env, k, klen, v, vlen); _item = map_add_n(rcv->env, k, klen, v, vlen);
item = &rcv->env->items[_item.i]; item = &rcv->env->items[_item.i];
item->v.vmalloc = 0;
assert(item);
assert(item->v.s);
assert(item->v.len);
if (strchr(v, '$')) { if ((d = strchr(v, '$')) && d < v+vlen) {
assert(item);
assert(item->v.s);
item->v.len = rcv_sh_substitute(rcv, item->v.s, item->v.len, &item->v.s); item->v.len = rcv_sh_substitute(rcv, item->v.s, item->v.len, &item->v.s);
item->v.vmalloc = 1; item->v.vmalloc = 1;
} else {
item->v.vmalloc = 0;
} }
if (rcv->xhp.flags & XBPS_FLAG_DEBUG) { if (rcv->xhp.flags & XBPS_FLAG_DEBUG) {
printf("%s: %.*s %.*s\n", rcv->fname, printf("%s: %.*s %.*s\n", rcv->fname,
(int)item->k.len, item->k.s, (int)item->k.len-1, item->k.s,
(int)item->v.len, item->v.s); (int)item->v.len, item->v.s);
} }
if (strncmp("pkgname", k, klen) == 0) { if (strncmp("pkgname", k, klen) == 0) {