mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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 <[email protected]> CC: Clemens Ladisch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
b7463c71fb
commit
0720a06a75
4 changed files with 44 additions and 17 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue