From 915b30adfeb83b709370c038deea2357265934a4 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Wed, 15 Sep 2010 21:08:19 +0000
Subject: [PATCH] =?UTF-8?q?revert=20part=20of=20the=20=E2=80=9Csize=20redu?=
 =?UTF-8?q?ction=E2=80=9D=20diff=20(zero=20size=20change=20though):=20shel?=
 =?UTF-8?q?lf()=20implies=20an=20shf=5Fflush()=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 check.t | 4 ++--
 exec.c  | 4 ++--
 funcs.c | 4 ++--
 sh.h    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/check.t b/check.t
index ae64589..1442ba7 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.392 2010/09/14 21:26:07 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.393 2010/09/15 21:08:16 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -25,7 +25,7 @@
 # http://www.research.att.com/~gsf/public/ifs.sh
 
 expected-stdout:
-	@(#)MIRBSD KSH R39 2010/09/14
+	@(#)MIRBSD KSH R39 2010/09/15
 description:
 	Check version of shell.
 stdin:
diff --git a/exec.c b/exec.c
index 012a900..cdf96b7 100644
--- a/exec.c
+++ b/exec.c
@@ -22,7 +22,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.82 2010/09/14 21:26:11 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.83 2010/09/15 21:08:17 tg Exp $");
 
 #ifndef MKSH_DEFAULT_EXECSHELL
 #define MKSH_DEFAULT_EXECSHELL	"/bin/sh"
@@ -1349,7 +1349,7 @@ do_selectargs(const char **ap, bool print_menu)
 		 */
 		if (print_menu || !*str_val(global("REPLY")))
 			pr_menu(ap);
-		shf_puts(str_val(global("PS3")), shl_out);
+		shellf("%s", str_val(global("PS3")));
 		if (call_builtin(findcom("read", FC_BI), read_args))
 			return (NULL);
 		s = str_val(global("REPLY"));
diff --git a/funcs.c b/funcs.c
index effd9ff..1a605e0 100644
--- a/funcs.c
+++ b/funcs.c
@@ -25,7 +25,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.162 2010/09/14 21:26:12 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.163 2010/09/15 21:08:18 tg Exp $");
 
 #if HAVE_KILLPG
 /*
@@ -2065,7 +2065,7 @@ c_read(const char **wp)
 			 * (it also doesn't check the interactive flag,
 			 * as is indicated in the Kornshell book).
 			 */
-			shf_puts(cp + 1, shl_out);
+			shellf("%s", cp+1);
 		}
 	}
 
diff --git a/sh.h b/sh.h
index 5a11b47..2b6f238 100644
--- a/sh.h
+++ b/sh.h
@@ -154,9 +154,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.414 2010/09/14 21:26:16 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.415 2010/09/15 21:08:19 tg Exp $");
 #endif
-#define MKSH_VERSION "R39 2010/09/14"
+#define MKSH_VERSION "R39 2010/09/15"
 
 #ifndef MKSH_INCLUDES_ONLY