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

OpenBSD RCSID merge, and logical follow one change:

Browse Source 
handle unknown bases as ksh93 does: larger downgrade to 10
(although our max will stay 36, as ksh93 doesn’t have upper/lowecase)
and smaller downgrade for typeset -i, but not for arithmetics
This commit is contained in:
tg
2014-12-15 23:18:47 +00:00
parent dcdc828c41
commit 5650b03590
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
funcs.c
View File

@ -38,7 +38,7 @@
#endif
#endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.261 2014/11/25 21:13:25 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.262 2014/12/15 23:18:47 tg Exp $");
#if HAVE_KILLPG
/*
@ -768,9 +768,13 @@ c_typeset(const char **wp)
if (fieldstr && !bi_getn(fieldstr, &field))
return (1);
if (basestr && (!bi_getn(basestr, &base) || base < 1 || base > 36)) {
bi_errorf("%s: %s", "bad integer base", basestr);
return (1);
if (basestr) {
if (!bi_getn(basestr, &base)) {
bi_errorf("%s: %s", "bad integer base", basestr);
return (1);
}
if (base < 1 || base > 36)
base = 10;
}
if (!(builtin_opt.info & GI_MINUSMINUS) && wp[builtin_opt.optind] &&