From 276d61f564ac22244a1359aa22c319a27b105adc Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sun, 21 Aug 2011 12:52:25 -0700
Subject: [PATCH] sh: Honor -n while processing -c string.

Obtained-from:   FreeBSD 222676
---
 bin/sh/eval.c                              | 4 ++--
 tools/regression/bin/sh/execution/set-n4.0 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 tools/regression/bin/sh/execution/set-n4.0

diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 7f9ae8c083..1de8c311d0 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * @(#)eval.c	8.9 (Berkeley) 6/8/95
- * $FreeBSD: src/bin/sh/eval.c,v 1.105 2011/05/21 22:03:06 jilles Exp $
+ * $FreeBSD: src/bin/sh/eval.c,v 1.106 2011/06/04 11:28:42 jilles Exp $
  */
 
 #include <sys/time.h>
@@ -166,7 +166,7 @@ evalstring(char *s, int flags)
 	setstackmark(&smark);
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
-		if (n != NULL) {
+		if (n != NULL && !nflag) {
 			if (flags_exit && preadateof())
 				evaltree(n, flags | EV_EXIT);
 			else
diff --git a/tools/regression/bin/sh/execution/set-n4.0 b/tools/regression/bin/sh/execution/set-n4.0
new file mode 100644
index 0000000000..29bf3df2a4
--- /dev/null
+++ b/tools/regression/bin/sh/execution/set-n4.0
@@ -0,0 +1,3 @@
+# $FreeBSD: src/tools/regression/bin/sh/execution/set-n4.0,v 1.1 2011/06/04 11:28:42 jilles Exp $
+
+$SH -nc 'echo bad'
-- 
2.41.0