From 6e98fbe27bff2377177f565dbdcca6844e9552d4 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 20 Apr 2010 09:10:07 +0000
Subject: [PATCH] =?UTF-8?q?Fourth=20time=E2=80=99s=20a=20charm=E2=80=A6=20?=
 =?UTF-8?q?another=20bugfix=20related=20to=20the=20commitids=201004BBDD845?=
 =?UTF-8?q?56472D84,=201004BBF77B81D30DA7C=20and=201004BBF7CD656308A1C=20t?=
 =?UTF-8?q?o=20unbreak=20kwalletcli?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 check.t | 6 ++++--
 eval.c  | 4 ++--
 sh.h    | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/check.t b/check.t
index f6ac0d1..1df8262 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.373 2010/04/09 19:16:29 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.374 2010/04/20 09:10:05 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/04/09
+	@(#)MIRBSD KSH R39 2010/04/20
 description:
 	Check version of shell.
 stdin:
@@ -1046,6 +1046,7 @@ stdin:
 	(echo -n '37 '; printf '<%s> ' ${v-a\ b} x ${v-c\ d}; echo .) 2>&- || echo failed in 37
 	(echo 38 ${IFS+x'a'y} / "${IFS+x'a'y}" .) 2>&- || echo failed in 38
 	foo="x'a'y"; (echo 39 ${foo%*'a'*} / "${foo%*'a'*}" .) 2>&- || echo failed in 39
+	foo="a b c"; (echo -n '40 '; printf '<%s> ' "${foo#a}"; echo .) 2>&- || echo failed in 40
 expected-stdout:
 	1 }z
 	2 ''z}
@@ -1086,6 +1087,7 @@ expected-stdout:
 	37 <a b> <x> <c d> .
 	38 xay / x'a'y .
 	39 x' / x' .
+	40 < b c> .
 ---
 name: expand-unglob-dblq
 description:
diff --git a/eval.c b/eval.c
index df447d8..902351e 100644
--- a/eval.c
+++ b/eval.c
@@ -22,7 +22,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.86 2010/04/09 19:16:30 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.87 2010/04/20 09:10:07 tg Exp $");
 
 /*
  * string expansion
@@ -568,7 +568,7 @@ expand(const char *cp,	/* input word */
 				sp++; /* ({) skip the } or x */
 				tilde_ok = 0;	/* in case of ${unset:-} */
 				*dp = '\0';
-				quote = st->quotew;
+				quote = st->quotep;
 				f = st->f;
 				if (f&DOBLANK)
 					doblank--;
diff --git a/sh.h b/sh.h
index 3424266..17fefe7 100644
--- a/sh.h
+++ b/sh.h
@@ -150,9 +150,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.388 2010/04/09 19:16:31 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.389 2010/04/20 09:10:07 tg Exp $");
 #endif
-#define MKSH_VERSION "R39 2010/04/09"
+#define MKSH_VERSION "R39 2010/04/20"
 
 #ifndef MKSH_INCLUDES_ONLY