JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

factor out some common code

Browse Source
This commit is contained in:
tg
2011-06-21 21:08:50 +00:00
parent 6524812f6b
commit f4e22bc4c8
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
var.c
View File

@ -26,7 +26,7 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.123 2011/06/05 19:58:20 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/var.c,v 1.124 2011/06/21 21:08:50 tg Exp $");
/*- /*-
* Variables * Variables
@ -143,6 +143,27 @@ initvar(void)
} }
} }
/* common code for several functions below */
static struct block *
varsearch(struct block *l, struct tbl **vpp, const char *vn, uint32_t h)
{
register struct tbl *vp;
if (l) {
varsearch_loop:
if ((vp = ktsearch(&l->vars, vn, h)) != NULL)
goto varsearch_out;
if (l->next != NULL) {
l = l->next;
goto varsearch_loop;
}
}
vp = NULL;
varsearch_out:
*vpp = vp;
return (l);
}
/* /*
* Used to calculate an array index for global()/local(). Sets *arrayp * Used to calculate an array index for global()/local(). Sets *arrayp
* to true if this is an array, sets *valp to the array index, returns * to true if this is an array, sets *valp to the array index, returns
@ -159,17 +180,12 @@ array_index_calc(const char *n, bool *arrayp, uint32_t *valp)
redo_from_ref: redo_from_ref:
p = skip_varname(n, false); p = skip_varname(n, false);
if (!set_refflag && (p != n) && ksh_isalphx(n[0])) { if (!set_refflag && (p != n) && ksh_isalphx(n[0])) {
struct block *l = e->loc;
struct tbl *vp; struct tbl *vp;
char *vn; char *vn;
uint32_t h;
strndupx(vn, n, p - n, ATEMP); strndupx(vn, n, p - n, ATEMP);
h = hash(vn);
/* check if this is a reference */ /* check if this is a reference */
do { varsearch(e->loc, &vp, vn, hash(vn));
vp = ktsearch(&l->vars, vn, h);
} while (!vp && (l = l->next));
afree(vn, ATEMP); afree(vn, ATEMP);
if (vp && (vp->flag & (DEFINED|ASSOC|ARRAY)) == if (vp && (vp->flag & (DEFINED|ASSOC|ARRAY)) ==
(DEFINED|ASSOC)) { (DEFINED|ASSOC)) {
@ -261,17 +277,9 @@ global(const char *n)
} }
return (vp); return (vp);
} }
for (l = e->loc; ; l = l->next) { l = varsearch(e->loc, &vp, n, h);
vp = ktsearch(&l->vars, n, h); if (vp != NULL)
if (vp != NULL) { return (array ? arraysearch(vp, val) : vp);
if (array)
return (arraysearch(vp, val));
else
return (vp);
}
if (l->next == NULL)
break;
}
vp = ktenter(&l->vars, n, h); vp = ktenter(&l->vars, n, h);
if (array) if (array)
vp = arraysearch(vp, val); vp = arraysearch(vp, val);
@ -304,12 +312,10 @@ local(const char *n, bool copy)
} }
vp = ktenter(&l->vars, n, h); vp = ktenter(&l->vars, n, h);
if (copy && !(vp->flag & DEFINED)) { if (copy && !(vp->flag & DEFINED)) {
struct block *ll = l; struct tbl *vq;
struct tbl *vq = NULL;
while ((ll = ll->next) && !(vq = ktsearch(&ll->vars, n, h))) varsearch(l->next, &vq, n, h);
; if (vq != NULL) {
if (vq) {
vp->flag |= vq->flag & vp->flag |= vq->flag &
(EXPORT | INTEGER | RDONLY | LJUST | RJUST | (EXPORT | INTEGER | RDONLY | LJUST | RJUST |
ZEROFIL | LCASEV | UCASEV_AL | INT_U | INT_L); ZEROFIL | LCASEV | UCASEV_AL | INT_U | INT_L);