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

• finally, the code and manual page text to deprecate, and code to not

Browse Source 
handle any more, octal 010 style constants, as promised
• overhaul the manpage re. arithmetic expressions, make the guarantees
  mksh code has explicitly, precisely, clear
• to reduce burden of the compiler, getint() now operates on mksh_uari_t
  internally; it already applied the sign after operation, anyway (C99
  guarantees wraparound on unsigned types, but for signed types we need
  specific compiler support; apparently, this comes from hardware limits)
• use const and shuffle order of locals around while here
This commit is contained in:
tg
2011-12-10 13:34:19 +00:00
parent f8098a7f48
commit 3b87d173d4
4 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
var.c
View File

@ -26,7 +26,7 @@
#include <sys/sysctl.h>
#endif
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.136 2011/11/26 00:45:03 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.137 2011/12/10 13:34:19 tg Exp $");
/*-
* Variables
@ -469,10 +469,10 @@ setint(struct tbl *vq, mksh_ari_t n)
static int
getint(struct tbl *vp, mksh_ari_t *nump, bool arith)
{
char *s;
int c, base, neg;
mksh_uari_t num;
const char *s;
bool have_base = false;
mksh_ari_t num;
if (vp->flag&SPECIAL)
getspec(vp);
@ -487,6 +487,13 @@ getint(struct tbl *vp, mksh_ari_t *nump, bool arith)
base = 10;
num = 0;
neg = 0;
#ifdef MKSH_DISABLE_DEPRECATED
if (arith && s[0] == '0' && (s[1] | 0x20) == 'x') {
s += 2;
base = 16;
have_base = true;
}
#else
if (arith && *s == '0' && *(s+1)) {
s++;
if (*s == 'x' || *s == 'X') {
@ -499,19 +506,20 @@ getint(struct tbl *vp, mksh_ari_t *nump, bool arith)
base = 8;
have_base = true;
}
for (c = *s++; c ; c = *s++) {
#endif
while ((c = *s++)) {
if (c == '-') {
neg++;
continue;
} else if (c == '#') {
base = (int)num;
if (have_base || base < 1 || base > 36)
if (have_base || num < 1 || num > 36)
return (-1);
base = (int)num;
if (base == 1) {
unsigned int wc;
if (!UTFMODE)
wc = *(unsigned char *)s;
wc = *(const unsigned char *)s;
else if (utf_mbtowc(&wc, s) == (size_t)-1)
/* OPTU-8 -> OPTU-16 */
/*
@ -519,7 +527,7 @@ getint(struct tbl *vp, mksh_ari_t *nump, bool arith)
* the same as 1#\x80 does, thus is
* not round-tripping correctly XXX)
*/
wc = 0xEF00 + *(unsigned char *)s;
wc = 0xEF00 + *(const unsigned char *)s;
*nump = (mksh_ari_t)wc;
return (1);
}
@ -538,9 +546,7 @@ getint(struct tbl *vp, mksh_ari_t *nump, bool arith)
return (-1);
num = num * base + c;
}
if (neg)
num = -num;
*nump = num;
*nump = neg ? -((mksh_ari_t)num) : (mksh_ari_t)num;
return (base);
}