Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754044Ab2JCOes (ORCPT ); Wed, 3 Oct 2012 10:34:48 -0400 Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:56090 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753282Ab2JCOeq (ORCPT ); Wed, 3 Oct 2012 10:34:46 -0400 X-IronPort-AV: E=Sophos;i="4.80,528,1344211200"; d="scan'208";a="14918107" From: Frediano Ziglio To: "sfrench@samba.org" CC: Frediano Ziglio , "jlayton@redhat.com" , "linux-cifs@vger.kernel.org" , "samba-technical@lists.samba.org" , "linux-kernel@vger.kernel.org" Date: Wed, 3 Oct 2012 15:34:44 +0100 Subject: Re: [PATCH v2] Convert properly UTF-8 to UTF-16 Thread-Topic: [PATCH v2] Convert properly UTF-8 to UTF-16 Thread-Index: Ac2hdDuCf+EyWs7kQsG+RiE+NQ7DvQ== Message-ID: <7CE799CC0E4DE04B88D5FDF226E18AC2E08D0408DA@LONPMAILBOX01.citrite.net> References: <7CE799CC0E4DE04B88D5FDF226E18AC2CDFFB08D16@LONPMAILBOX01.citrite.net> <20120807064752.22e0da81@corrin.poochiereds.net> <7CE799CC0E4DE04B88D5FDF226E18AC2E07634EB82@LONPMAILBOX01.citrite.net> In-Reply-To: <7CE799CC0E4DE04B88D5FDF226E18AC2E07634EB82@LONPMAILBOX01.citrite.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id q93EZBDa005153 Content-Length: 2568 Lines: 74 On Tue, 2012-08-07 at 06:47 -0400, Jeff Layton wrote: > On Tue, 7 Aug 2012 10:33:03 +0100 > Frediano Ziglio wrote: > > > > > wchar_t is currently 16bit so converting a utf8 encoded characters not > > in plane 0 (>= 0x10000) to wchar_t (that is calling char2uni) lead to a > > -EINVAL return. This patch detect utf8 in cifs_strtoUTF16 and add special > > code calling utf8s_to_utf16s. > > > > Signed-off-by: Frediano Ziglio > > --- > > fs/cifs/cifs_unicode.c | 22 ++++++++++++++++++++++ > > 1 files changed, 22 insertions(+), 0 deletions(-) > > > > diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c > > index 7dab9c0..1166b95 100644 > > --- a/fs/cifs/cifs_unicode.c > > +++ b/fs/cifs/cifs_unicode.c > > @@ -203,6 +203,27 @@ cifs_strtoUTF16(__le16 *to, const char *from, int len, > > int i; > > wchar_t wchar_to; /* needed to quiet sparse */ > > > > + /* special case for utf8 to handle no plane0 chars */ > > + if (!strcmp(codepage->charset, "utf8")) { > > + /* > > + * convert utf8 -> utf16, we assume we have enough space > > + * as caller should have assumed conversion does not overflow > > + * in destination len is length in wchar_t units (16bits) > > + */ > > + i = utf8s_to_utf16s(from, len, UTF16_LITTLE_ENDIAN, > > + (wchar_t *) to, len); > > + > > + /* if success terminate and exit */ > > + if (i >= 0) > > + goto success; > > + /* > > + * if fails fall back to UCS encoding as this > > + * function should not return negative values > > + * currently can fail only if source contains > > + * invalid encoded characters > > + */ > > + } > > + > > for (i = 0; len && *from; i++, from += charlen, len -= charlen) { > > charlen = codepage->char2uni(from, len, &wchar_to); > > if (charlen < 1) { > > @@ -215,6 +236,7 @@ cifs_strtoUTF16(__le16 *to, const char *from, int len, > > put_unaligned_le16(wchar_to, &to[i]); > > } > > > > +success: > > put_unaligned_le16(0, &to[i]); > > return i; > > } > > Looks reasonable... > > Acked-by: Jeff Layton Steve, could you consider my patch for inclusion into Linux? Thanks, Frediano ????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?