aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2009-04-30 06:45:08 -0400
committerSteve French <sfrench@us.ibm.com>2009-04-30 15:32:11 +0000
commitd37dc42ab6f040b8f0f2962ab219c5b2accf748d (patch)
tree5030ecff53843afe1f362cdca3d0794cda17fac1 /include/linux
parentcbb7fe129bb2b836083ebcc256c43faff4b48cc2 (diff)
downloadmrst-s0i3-test-d37dc42ab6f040b8f0f2962ab219c5b2accf748d.tar.gz
mrst-s0i3-test-d37dc42ab6f040b8f0f2962ab219c5b2accf748d.tar.xz
mrst-s0i3-test-d37dc42ab6f040b8f0f2962ab219c5b2accf748d.zip
nls: add a nls_nullsize inline
It's possible for character sets to require a multi-byte null string terminator. Add a helper function that determines the size of the null terminator at runtime. Signed-off-by: Jeff Layton <jlayton@redhat.com> Acked-by: Suresh Jayaraman <sjayaraman@suse.de> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/nls.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/nls.h b/include/linux/nls.h
index 6a882208301..52b1a76c1b4 100644
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -58,6 +58,25 @@ static inline int nls_strnicmp(struct nls_table *t, const unsigned char *s1,
return 0;
}
+/*
+ * nls_nullsize - return length of null character for codepage
+ * @codepage - codepage for which to return length of NULL terminator
+ *
+ * Since we can't guarantee that the null terminator will be a particular
+ * length, we have to check against the codepage. If there's a problem
+ * determining it, assume a single-byte NULL terminator.
+ */
+static inline int
+nls_nullsize(const struct nls_table *codepage)
+{
+ int charlen;
+ char tmp[NLS_MAX_CHARSET_SIZE];
+
+ charlen = codepage->uni2char(0, tmp, NLS_MAX_CHARSET_SIZE);
+
+ return charlen > 0 ? charlen : 1;
+}
+
#define MODULE_ALIAS_NLS(name) MODULE_ALIAS("nls_" __stringify(name))
#endif /* _LINUX_NLS_H */