Module Name: src
Committed By: tnozaki
Date: Mon Oct 10 22:45:45 UTC 2011
Modified Files:
src/lib/libc/citrus/modules: citrus_iso2022.c
Log Message:
revert r1.21, still problem exists for posix2008 mbsnrtowcs(not yet commited),
but i have no time to investigate t_mbrtowc failure.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/citrus/modules/citrus_iso2022.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/citrus/modules/citrus_iso2022.c
diff -u src/lib/libc/citrus/modules/citrus_iso2022.c:1.21 src/lib/libc/citrus/modules/citrus_iso2022.c:1.22
--- src/lib/libc/citrus/modules/citrus_iso2022.c:1.21 Fri Oct 7 18:59:13 2011
+++ src/lib/libc/citrus/modules/citrus_iso2022.c Mon Oct 10 22:45:45 2011
@@ -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
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);
}
