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

IFS_IWS, but doesn’t really change much…

This commit is contained in:
tg 2014-10-19 21:04:47 +00:00
parent 612d92add6
commit 67d8c69353
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.155 2014/10/19 20:59:43 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.156 2014/10/19 21:04:47 tg Exp $");
/* /*
* string expansion * string expansion
@ -704,7 +704,7 @@ expand(
x.str = trimsub(str_val(st->var), x.str = trimsub(str_val(st->var),
dp, st->stype); dp, st->stype);
if (x.str[0] != '\0') { if (x.str[0] != '\0') {
word = IFS_WS; word = IFS_IWS;
type = XSUB; type = XSUB;
} else } else
type = quote ? XSUB : XNULLSUB; type = quote ? XSUB : XNULLSUB;
@ -743,7 +743,7 @@ expand(
if (f & DOBLANK) if (f & DOBLANK)
doblank++; doblank++;
st = st->prev; st = st->prev;
word = quote || (!*x.str && (f & DOASNFIELD)) ? IFS_WORD : IFS_WS; word = quote || (!*x.str && (f & DOASNFIELD)) ? IFS_WORD : IFS_IWS;
continue; continue;
case '?': { case '?': {
char *s = Xrestpos(ds, dp, st->base); char *s = Xrestpos(ds, dp, st->base);
@ -759,7 +759,7 @@ expand(
case 0x100 | 'Q': case 0x100 | 'Q':
dp = Xrestpos(ds, dp, st->base); dp = Xrestpos(ds, dp, st->base);
type = XSUB; type = XSUB;
word = quote || (!*x.str && (f & DOASNFIELD)) ? IFS_WORD : IFS_WS; word = quote || (!*x.str && (f & DOASNFIELD)) ? IFS_WORD : IFS_IWS;
if (f & DOBLANK) if (f & DOBLANK)
doblank++; doblank++;
st = st->prev; st = st->prev;
@ -800,7 +800,7 @@ expand(
if (f & DOBLANK) { if (f & DOBLANK) {
doblank--; doblank--;
if (dp == Xstring(ds, dp)) if (dp == Xstring(ds, dp))
word = IFS_WS; word = IFS_IWS;
} }
continue; continue;