Module Name: src
Committed By: mlelstv
Date: Mon Jul 8 06:45:01 UTC 2019
Modified Files:
src/lib/libc/citrus/modules: citrus_johab.c
Log Message:
The correct fix for lib/51000 is not to remove the apparently dead assignment
but to add the missing usage.
>From https://bitbucket.org/tnozaki/netbsd/commits/24b35fdce250
Thanks to Takehiko Nozaki
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/citrus/modules/citrus_johab.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_johab.c
diff -u src/lib/libc/citrus/modules/citrus_johab.c:1.6 src/lib/libc/citrus/modules/citrus_johab.c:1.7
--- src/lib/libc/citrus/modules/citrus_johab.c:1.6 Tue May 31 03:34:14 2016
+++ src/lib/libc/citrus/modules/citrus_johab.c Mon Jul 8 06:45:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_johab.c,v 1.6 2016/05/31 03:34:14 dholland Exp $ */
+/* $NetBSD: citrus_johab.c,v 1.7 2019/07/08 06:45:01 mlelstv Exp $ */
/*-
* Copyright (c)2006 Citrus Project,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_johab.c,v 1.6 2016/05/31 03:34:14 dholland Exp $");
+__RCSID("$NetBSD: citrus_johab.c,v 1.7 2019/07/08 06:45:01 mlelstv Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -349,9 +349,10 @@ _citrus_JOHAB_stdenc_cstowc(_JOHABEncodi
l = ((idx >> 8) & 0xFF) - n;
t = (idx & 0xFF) - 0x21;
linear = (l * 94) + t;
- /*l = (linear / 188) + m;*/
+ l = (linear / 188) + m;
t = linear % 188;
t += (t <= 0x4D) ? 0x31 : 0x43;
+ *wc = (wchar_t)((l << 8) | t);
break;
default:
return EILSEQ;
