diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2011-11-17 16:42:19 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-18 10:51:01 -0800 |
| commit | 0720a06a7518c9d0c0125bd5d1f3b6264c55c3dd (patch) | |
| tree | 6895ca20afb24b38f0246b370cba7dc6e72764cb /fs/fat | |
| parent | b7463c71fbbff7111d0c879d2f64fe2b08f51848 (diff) | |
| download | linux-0720a06a7518c9d0c0125bd5d1f3b6264c55c3dd.tar.gz linux-0720a06a7518c9d0c0125bd5d1f3b6264c55c3dd.tar.bz2 linux-0720a06a7518c9d0c0125bd5d1f3b6264c55c3dd.zip | |
NLS: improve UTF8 -> UTF16 string conversion routine
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@suse.de>
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 a87a65663c25..c25cf151b84b 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -512,7 +512,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) |