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

LANGUAGE CHANGE: $((…)) results are now IFS-split, as per POSIX 201x

Browse Source
This commit is contained in:
tg 2014-06-09 11:16:07 +00:00
parent 2f620132af
commit b7c41f240c
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.649 2014/06/09 11:13:17 tg Exp $
# $MirOS: src/bin/mksh/check.t,v 1.650 2014/06/09 11:16:06 tg Exp $
# OpenBSD src/regress/bin/ksh updated: 2013/12/02 20:39:44
#-
# Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@ -3736,7 +3736,6 @@ expected-stdout:
name: IFS-arith-1
description:
http://austingroupbugs.net/view.php?id=832
expected-fail: yes
stdin:
${ZSH_VERSION+false} || emulate sh
${BASH_VERSION+set -o posix}

29
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.149 2014/06/09 10:41:03 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.150 2014/06/09 11:16:07 tg Exp $");
/*
* string expansion
@ -324,9 +324,9 @@ expand(
}
continue;
case EXPRSUB:
word = IFS_WORD;
tilde_ok = 0;
if (f & DONTRUNCOMMAND) {
word = IFS_WORD;
*dp++ = '$'; *dp++ = '('; *dp++ = '(';
while (*sp != '\0') {
Xcheck(ds, dp);
@ -343,11 +343,10 @@ expand(
v_evaluate(&v, substitute(sp, 0),
KSH_UNWIND_ERROR, true);
sp = strnul(sp) + 1;
cp = str_val(&v);
while (*cp) {
Xcheck(ds, dp);
*dp++ = *cp++;
}
x.str = str_val(&v);
type = XSUB;
if (f & DOBLANK)
doblank++;
}
continue;
case OSUBST: {
@ -683,7 +682,7 @@ expand(
*dp = '\0';
quote = st->quotep;
f = st->f;
if (f&DOBLANK)
if (f & DOBLANK)
doblank--;
switch (st->stype & 0x17F) {
case '#':
@ -707,7 +706,7 @@ expand(
type = XSUB;
} else
type = quote ? XSUB : XNULLSUB;
if (f&DOBLANK)
if (f & DOBLANK)
doblank++;
st = st->prev;
continue;
@ -739,7 +738,7 @@ expand(
dp, len), KSH_UNWIND_ERROR);
x.str = str_val(st->var);
type = XSUB;
if (f&DOBLANK)
if (f & DOBLANK)
doblank++;
st = st->prev;
continue;
@ -757,7 +756,7 @@ expand(
case 0x100 | 'Q':
dp = Xrestpos(ds, dp, st->base);
type = XSUB;
if (f&DOBLANK)
if (f & DOBLANK)
doblank++;
st = st->prev;
continue;
@ -794,7 +793,7 @@ expand(
* other stuff inside the quotes).
*/
type = XBASE;
if (f&DOBLANK) {
if (f & DOBLANK) {
doblank--;
/*
* XXX not really correct:
@ -812,7 +811,7 @@ expand(
case XSUBMID:
if ((c = *x.str++) == 0) {
type = XBASE;
if (f&DOBLANK)
if (f & DOBLANK)
doblank--;
continue;
}
@ -833,7 +832,7 @@ expand(
word = IFS_WORD;
if ((x.str = *x.u.strv++) == NULL) {
type = XBASE;
if (f&DOBLANK)
if (f & DOBLANK)
doblank--;
continue;
}
@ -882,7 +881,7 @@ expand(
if (x.split)
subst_exstat = waitlast();
type = XBASE;
if (f&DOBLANK)
if (f & DOBLANK)
doblank--;
continue;
}