diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2011-11-17 16:42:19 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-28 06:32:26 -0800 |
| commit | 8eac4364548b8f53476602969a2fba65d029d8b7 (patch) | |
| tree | 187e16169448d873b45cc801603a93d8e4dce3bf /fs/fat | |
| parent | 4b5784741fdfdb5fa91edc6ea8fc5eeeed0b4a6a (diff) | |
| download | kernel_samsung_espresso10-8eac4364548b8f53476602969a2fba65d029d8b7.tar.gz kernel_samsung_espresso10-8eac4364548b8f53476602969a2fba65d029d8b7.tar.bz2 kernel_samsung_espresso10-8eac4364548b8f53476602969a2fba65d029d8b7.zip | |
NLS: improve UTF8 -> UTF16 string conversion routine
commit 0720a06a7518c9d0c0125bd5d1f3b6264c55c3dd upstream.
The utf8s_to_utf16s conversion routine needs to be improved. Unlike
its utf16s_to_utf8s sibling, it doesn't accept arguments specifying
the maximum length of the output buffer or the endianness of its
16-bit output.
This patch (as1501) adds the two missing arguments, and adjusts the
only two places in the kernel where the function is called. A
follow-on patch will add a third caller that does utilize the new
capabilities.
The two conversion routines are still annoyingly inconsistent in the
way they handle invalid byte combinations. But that's a subject for a
different patch.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/namei_vfat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index 20b4ea53fdc..6ee3c367be6 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -514,7 +514,8 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, int charlen; if (utf8) { - *outlen = utf8s_to_utf16s(name, len, (wchar_t *)outname); + *outlen = utf8s_to_utf16s(name, len, UTF16_HOST_ENDIAN, + (wchar_t *) outname, FAT_LFN_LEN + 2); if (*outlen < 0) return *outlen; else if (*outlen > FAT_LFN_LEN) |