Moved tree_attach() and tree_detach() upper so that they could be used by reset_cache().

[android-x86/external-exfat.git] / libexfat / utf.c

diff --git a/libexfat/utf.c b/libexfat/utf.c
index 4ed9b5a..983c793 100644 (file)
--- a/libexfat/utf.c
+++ b/libexfat/utf.c
@@ -2,7 +2,7 @@
        utf.c (13.09.09)
        exFAT file system implementation library.
 
-       Copyright (C) 2009, 2010  Andrew Nayenko
+       Copyright (C) 2010-2012  Andrew Nayenko
 
        This program is free software: you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -89,6 +89,7 @@ static const le16_t* utf16_to_wchar(const le16_t* input, wchar_t* wc,
                        return NULL;
                *wc = ((wchar_t) (le16_to_cpu(input[0]) & 0x3ff) << 10);
                *wc |= (le16_to_cpu(input[1]) & 0x3ff);
+               *wc += 0x10000;
                return input + 2;
        }
        else
@@ -180,18 +181,13 @@ static le16_t* wchar_to_utf16(le16_t* output, wchar_t wc, size_t outsize)
        if (wc <= 0xffff) /* if character is from BMP */
        {
                if (outsize == 0)
-               {
-                       exfat_error("name is too long");
                        return NULL;
-               }
                output[0] = cpu_to_le16(wc);
                return output + 1;
        }
        if (outsize < 2)
-       {
-               exfat_error("name is too long");
                return NULL;
-       }
+       wc -= 0x10000;
        output[0] = cpu_to_le16(0xd800 | ((wc >> 10) & 0x3ff));
        output[1] = cpu_to_le16(0xdc00 | (wc & 0x3ff));
        return output + 2;