From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bhuna.collabora.co.uk ([46.235.227.227]:53262 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933608AbeEIGuK (ORCPT ); Wed, 9 May 2018 02:50:10 -0400 From: Gabriel Krisman Bertazi To: linux-fsdevel@vger.kernel.org Cc: jra@google.com, tytso@mit.edu, olaf@sgi.com, darrick.wong@oracle.com, kernel@lists.collabora.co.uk, Gabriel Krisman Bertazi Subject: [PATCH 09/15] nls: Add optional normalization and casefold hooks Date: Wed, 9 May 2018 03:48:00 -0300 Message-Id: <20180509064800.28658-10-krisman@collabora.co.uk> In-Reply-To: <20180509064800.28658-1-krisman@collabora.co.uk> References: <20180509064800.28658-1-krisman@collabora.co.uk> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 72698d524b42..efd3712f0e81 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 **folded); + int (*normalize)(const struct nls_table *charset, + const unsigned char *str, size_t len, + unsigned char **normalized); }; struct nls_table { @@ -156,6 +162,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 **folded) +{ + if (charset->ops->casefold) + return charset->ops->casefold(charset, str, len, folded); + + return -ENOTSUPP; +} + +static inline int nls_normalize(const struct nls_table *charset, + const unsigned char *str, size_t len, + unsigned char **normalized) +{ + if (charset->ops->normalize) + return charset->ops->normalize(charset, str, len, normalized); + + return -ENOTSUPP; +} + /* * nls_nullsize - return length of null character for codepage * @codepage - codepage for which to return length of NULL terminator -- 2.17.0