From dcbfc488556ccacf86c0be0cccea7f9b56e7ab97 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 14 Sep 2010 21:00:13 +0000
Subject: [PATCH] =?UTF-8?q?=E2=94=8C=E2=94=80=E2=94=80=E2=94=A4=20apply=20?=
 =?UTF-8?q?Android=20patch=20from=20Jeff=20Hamilton:=20=E2=94=82Don't=20al?=
 =?UTF-8?q?ias=20'stop'=20to=20'kill=20-STOP'=20=E2=94=82=20=E2=94=82Andro?=
 =?UTF-8?q?id=20has=20already=20has=20a=20stop=20command=20used=20?=
 =?UTF-8?q?=E2=94=82to=20stop=20the=20main=20runtime=20and=20the=20alias?=
 =?UTF-8?q?=20=E2=94=82interferes=20with=20testing=20tools=20that=20expect?=
 =?UTF-8?q?=20=E2=94=82stop=20to=20kill=20the=20runtime.=20=E2=94=82=20?=
 =?UTF-8?q?=E2=94=82Change-Id:=20I02b7efb9203dc39e97f63eb702a54ff79935b316?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although, this is closer to his first patchset and only takes
care of the alias, not the testsuite (which doesn’t run, at
least not out-of-the-box, nicely anyway) using #ifdef ANDROID.

We certainly want a more flexible testsuite…
---
 main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 23c89c1..ee7f75e 100644
--- a/main.c
+++ b/main.c
@@ -33,7 +33,7 @@
 #include <locale.h>
 #endif
 
-__RCSID("$MirOS: src/bin/mksh/main.c,v 1.170 2010/08/28 20:22:20 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/main.c,v 1.171 2010/09/14 21:00:13 tg Exp $");
 
 extern char **environ;
 
@@ -74,7 +74,9 @@ static const char *initcoms[] = {
 	"hash=alias -t",	/* not "alias -t --": hash -r needs to work */
 	"type=whence -v",
 #ifndef MKSH_UNEMPLOYED
+#ifndef ANDROID
 	"stop=kill -STOP",
+#endif
 	"suspend=kill -STOP $$",
 #endif
 	"autoload=typeset -fu",