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

cid 1004E0F5C27271F5B00 broke integer-base handling of built-in parameters

Browse Source 
mksh -c 'echo a=$RANDOM; RANDOM=0x12; echo b=$RANDOM' # behaviour changed
This commit is contained in:
tg
2011-11-08 22:07:15 +00:00
parent f92108dccc
commit c620f865c1
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
var.c
View File

@ -26,7 +26,7 @@
#include <sys/sysctl.h>
#endif
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.133 2011/10/16 00:18:56 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.134 2011/11/08 22:07:15 tg Exp $");
/*-
* Variables
@ -556,7 +556,7 @@ setint_v(struct tbl *vq, struct tbl *vp, bool arith)
if ((base = getint(vp, &num, arith)) == -1)
return (NULL);
setint_n(vq, num);
setint_n(vq, num, 0);
if (vq->type == 0)
/* default base */
vq->type = base;
@ -565,7 +565,7 @@ setint_v(struct tbl *vq, struct tbl *vp, bool arith)
/* convert variable vq to integer variable, setting its value to num */
void
setint_n(struct tbl *vq, mksh_ari_t num)
setint_n(struct tbl *vq, mksh_ari_t num, int newbase)
{
if (!(vq->flag & INTEGER) && (vq->flag & ALLOC)) {
vq->flag &= ~ALLOC;
@ -573,6 +573,8 @@ setint_n(struct tbl *vq, mksh_ari_t num)
afree(vq->val.s, vq->areap);
}
vq->val.i = num;
if (newbase != 0)
vq->type = newbase;
vq->flag |= ISSET|INTEGER;
if (vq->flag&SPECIAL)
setspec(vq);
@ -1133,7 +1135,7 @@ getspec(struct tbl *vp)
return;
}
vp->flag &= ~SPECIAL;
setint_n(vp, i);
setint_n(vp, i, 0);
vp->flag |= SPECIAL;
}