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

PR/43255: Make -n apply to the -c string so sh -n -c 'commands' works

Browse Source 
as it should. Also, other places where the shell parses strings of
commands are also now controlled by -n (traps, eval, ...)  (from kre)
This commit is contained in:
christos 2016-02-22 20:03:48 +00:00
parent 7b91d0e80f
commit 9e6b737d5a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/sh/eval.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eval.c,v 1.111 2016/01/04 03:00:24 christos Exp $ */ /* $NetBSD: eval.c,v 1.112 2016/02/22 20:03:48 christos Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -37,7 +37,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95"; static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else #else
__RCSID("$NetBSD: eval.c,v 1.111 2016/01/04 03:00:24 christos Exp $"); __RCSID("$NetBSD: eval.c,v 1.112 2016/02/22 20:03:48 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -220,7 +220,8 @@ evalstring(char *s, int flag)
setinputstring(s, 1); setinputstring(s, 1);
while ((n = parsecmd(0)) != NEOF) { while ((n = parsecmd(0)) != NEOF) {
evaltree(n, flag); if (nflag == 0)
evaltree(n, flag);
popstackmark(&smark); popstackmark(&smark);
} }
popfile(); popfile();