From b3f4c69f052859d9fc0b290f1b5d7b5195226494 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sat, 26 Nov 2011 17:56:30 +0000
Subject: [PATCH] #ifdef MKSH_DISABLE_DEPRECATED do not compile in features
 scheduled for removal

---
 Build.sh | 19 ++++++++++---------
 lex.c    |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Build.sh b/Build.sh
index 1775143..d0c8240 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.490 2011/11/25 23:29:30 tg Exp $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.491 2011/11/26 17:56:29 tg Exp $'
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #	Thorsten Glaser <tg@mirbsd.org>
@@ -25,13 +25,14 @@ srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.490 2011/11/25 23:29:30 tg Exp $'
 # Environment used:	CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF
 #			TARGET_OS TARGET_OSREV
 # Feature selectors:	USE_PRINTF_BUILTIN
-# CPPFLAGS recognised:	MKSH_ASSUME_UTF8 MKSH_BINSHREDUCED MKSH_CLS_STRING
-#			MKSH_CONSERVATIVE_FDS MKSH_MIDNIGHTBSD01ASH_COMPAT
-#			MKSH_NOPWNAM MKSH_NO_LIMITS MKSH_SMALL MKSH_S_NOVI
-#			MKSH_UNEMPLOYED MKSH_DEFAULT_EXECSHELL MKSHRC_PATH
-#			MKSH_DEFAULT_TMPDIR MKSH_CLRTOEOL_STRING MKSH_A4PB
-#			MKSH_NO_DEPRECATED_WARNING MKSH_DONT_EMIT_IDSTRING
-#			MKSH_NOPROSPECTOFWORK MKSH_NO_EXTERNAL_CAT
+# CPPFLAGS recognised:	MKSH_MIDNIGHTBSD01ASH_COMPAT MKSH_CONSERVATIVE_FDS
+#			MKSH_DONT_EMIT_IDSTRING MKSH_NO_DEPRECATED_WARNING
+#			MKSH_DISABLE_DEPRECATED MKSH_ASSUME_UTF8 MKSH_A4PB
+#			MKSH_SMALL MKSH_BINSHREDUCED MKSH_NOPROSPECTOFWORK
+#			MKSH_UNEMPLOYED MKSH_NO_LIMITS MKSH_DEFAULT_TMPDIR
+#			MKSH_DEFAULT_EXECSHELL MKSHRC_PATH MKSH_CLS_STRING
+#			MKSH_CLRTOEOL_STRING MKSH_NO_EXTERNAL_CAT
+#			MKSH_NOPWNAM MKSH_S_NOVI
 
 LC_ALL=C
 export LC_ALL
@@ -1182,7 +1183,7 @@ else
 		#define EXTERN
 		#define MKSH_INCLUDES_ONLY
 		#include "sh.h"
-		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.490 2011/11/25 23:29:30 tg Exp $");
+		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.491 2011/11/26 17:56:29 tg Exp $");
 		int main(void) { printf("Hello, World!\n"); return (0); }
 EOF
 	case $cm in
diff --git a/lex.c b/lex.c
index 9be0292..ecbf128 100644
--- a/lex.c
+++ b/lex.c
@@ -22,7 +22,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.157 2011/10/25 22:36:36 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.158 2011/11/26 17:56:30 tg Exp $");
 
 /*
  * states while lexing word
@@ -1440,7 +1440,7 @@ getsc_line(Source *s)
 		alarm(0);
 	}
 	cp = Xstring(s->xs, xp);
-#ifndef MKSH_SMALL
+#if !defined(MKSH_SMALL) && !defined(MKSH_DISABLE_DEPRECATED)
 	if (interactive && *cp == '!' && cur_prompt == PS1) {
 		int linelen;