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

apply oksh bugfix for my bugfix they applied in oksh… ugh…

Browse Source 
from halex@o: modified to handle the case when the expr is quoted

no difference in check.t or ifs.sh though…
This commit is contained in:
tg 2010-04-09 18:53:29 +00:00
parent b2d317986d
commit 3461fcdf20
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eval.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: eval.c,v 1.34 2009/01/29 23:27:26 jaredy Exp $ */ /* $OpenBSD: eval.c,v 1.35 2010/03/24 08:27:26 fgsch Exp $ */
/*- /*-
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
@ -22,7 +22,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.84 2010/04/08 13:21:04 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.85 2010/04/09 18:53:29 tg Exp $");
/* /*
* string expansion * string expansion
@ -583,7 +583,10 @@ expand(const char *cp, /* input word */
*/ */
x.str = trimsub(str_val(st->var), x.str = trimsub(str_val(st->var),
dp, st->stype); dp, st->stype);
type = strlen(x.str) ? XSUB : XNULLSUB; if (x.str[0] != '\0' || st->quote)
type = XSUB;
else
type = XNULLSUB;
if (f&DOBLANK) if (f&DOBLANK)
doblank++; doblank++;
st = st->prev; st = st->prev;