Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another fix from FreeBSD (this one from April 2009). 

When processing a string (as in eval, trap, or sh -c) don't allow
trailing \n's to destroy the exit status of the last command executed.

That is:
	sh -c 'false

	'
	echo $?
should produce 1, not 0.
This commit is contained in:
kre 2017-06-19 03:21:31 +00:00
parent 3892a5b005
commit 87d90665d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/sh/eval.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eval.c,v 1.149 2017/06/19 02:51:51 kre Exp $ */
/* $NetBSD: eval.c,v 1.150 2017/06/19 03:21:31 kre Exp $ */
/*-
* Copyright (c) 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
__RCSID("$NetBSD: eval.c,v 1.149 2017/06/19 02:51:51 kre Exp $");
__RCSID("$NetBSD: eval.c,v 1.150 2017/06/19 03:21:31 kre Exp $");
#endif
#endif /* not lint */
@ -220,7 +220,7 @@ evalstring(char *s, int flag)
while ((n = parsecmd(0)) != NEOF) {
XTRACE(DBG_EVAL, ("evalstring: "), showtree(n));
if (nflag == 0)
if (n && nflag == 0)
evaltree(n, flag | EV_MORE);
popstackmark(&smark);
}