From 6b58a1b843cb07926b09f6da5b453700d075f60d Mon Sep 17 00:00:00 2001
From: tnozaki <tnozaki@NetBSD.org>
Date: Mon, 10 Oct 2011 22:45:45 +0000
Subject: [PATCH] revert r1.21, still problem exists for posix2008
 mbsnrtowcs(not yet commited), but i have no time to investigate t_mbrtowc
 failure.

---
 lib/libc/citrus/modules/citrus_iso2022.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/libc/citrus/modules/citrus_iso2022.c b/lib/libc/citrus/modules/citrus_iso2022.c
index 9427295dcfe3..c31449a6afe4 100644
--- a/lib/libc/citrus/modules/citrus_iso2022.c
+++ b/lib/libc/citrus/modules/citrus_iso2022.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: citrus_iso2022.c,v 1.21 2011/10/07 18:59:13 tnozaki Exp $	*/
+/*	$NetBSD: citrus_iso2022.c,v 1.22 2011/10/10 22:45:45 tnozaki Exp $	*/
 
 /*-
  * Copyright (c)1999, 2002 Citrus Project,
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iso2022.c,v 1.21 2011/10/07 18:59:13 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_iso2022.c,v 1.22 2011/10/10 22:45:45 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
@@ -695,7 +695,7 @@ _ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei,
 			if (n < sp->len) {
 				if (nmatch == n) {
 					if (result)
-						*result = string + n;
+						*result = string;
 					return (_ISO2022INVALID);
 				}
 			} else {
@@ -755,7 +755,7 @@ asis:
 
 		/* we still need to wait for more characters to come */
 		if (result)
-			*result = string + n;
+			*result = string;
 		return (_ISO2022INVALID);
 
 	case CS94:
@@ -765,7 +765,7 @@ asis:
 
 		/* we still need to wait for more characters to come */
 		if (result)
-			*result = string + n;
+			*result = string;
 		return (_ISO2022INVALID);
 	}