From patchwork Tue Jul 3 17:06:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Krisman Bertazi X-Patchwork-Id: 938822 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=collabora.co.uk Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41KrCj4Ll4z9s1B for ; Wed, 4 Jul 2018 03:07:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934156AbeGCRHo (ORCPT ); Tue, 3 Jul 2018 13:07:44 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:33386 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934178AbeGCRHn (ORCPT ); Tue, 3 Jul 2018 13:07:43 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 5097A2605C7 From: Gabriel Krisman Bertazi To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, darrick.wong@oracle.com, kernel@collabora.com, Gabriel Krisman Bertazi Subject: [PATCH 09/20] nls: Add optional normalization and casefold hooks Date: Tue, 3 Jul 2018 13:06:49 -0400 Message-Id: <20180703170700.9306-10-krisman@collabora.co.uk> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180703170700.9306-1-krisman@collabora.co.uk> References: <20180703170700.9306-1-krisman@collabora.co.uk> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Signed-off-by: Gabriel Krisman Bertazi --- include/linux/nls.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/include/linux/nls.h b/include/linux/nls.h index deca7367feb8..7f95a1bd8e1f 100644 --- a/include/linux/nls.h +++ b/include/linux/nls.h @@ -4,6 +4,7 @@ #include #include +#include /* Unicode has changed over the years. Unicode code points no longer * fit into 16 bits; as of Unicode 5 valid code points range from 0 @@ -38,7 +39,12 @@ struct nls_ops { unsigned int c); unsigned char (*uppercase)(const struct nls_table *charset, unsigned int c); - + int (*casefold)(const struct nls_table *charset, + const unsigned char *str, size_t len, + unsigned char *dest, size_t dlen); + int (*normalize)(const struct nls_table *charset, + const unsigned char *str, size_t len, + unsigned char *dest, size_t dlen); }; struct nls_table { @@ -157,6 +163,26 @@ static inline int nls_strnicmp(struct nls_table *t, const unsigned char *s1, return nls_strncasecmp(t, s1, len, s2, len); } +static inline int nls_casefold(const struct nls_table *charset, + const unsigned char *str, size_t len, + unsigned char *dest, size_t dlen) +{ + if (charset->ops->casefold) + return charset->ops->casefold(charset, str, len, dest, dlen); + + return -ENOTSUPP; +} + +static inline int nls_normalize(const struct nls_table *charset, + const unsigned char *str, size_t len, + unsigned char *dest, size_t dlen) +{ + if (charset->ops->normalize) + return charset->ops->normalize(charset, str, len, dest, dlen); + + return -ENOTSUPP; +} + /* * nls_nullsize - return length of null character for codepage * @codepage - codepage for which to return length of NULL terminator