Use NTFS-3g character conversion functions if available

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index 78272dfc4994ce2128bd5a2e9253b20f56be482a..bcaefacddebff7cd7d4c6c180b265db7ccfdbe18 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -36,6 +36,11 @@
 #include <unistd.h>
 #include <errno.h>
 
+#ifdef WITH_NTFS_3G
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/unistr.h>
+#endif
+
 /* True if wimlib is to print an informational message when an error occurs.
  * This can be turned off by calling wimlib_set_print_errors(false). */
 #ifdef ENABLE_ERROR_MESSAGES
@@ -120,6 +125,8 @@ static const char *error_strings[] = {
                = "Failed to decompress compressed data",
        [WIMLIB_ERR_DELETE_STAGING_DIR]
                = "Failed to delete staging directory",
+       [WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED]
+               = "The process servicing the mounted WIM has crashed",
        [WIMLIB_ERR_FORK]
                = "Failed to fork another process",
        [WIMLIB_ERR_FUSE]
@@ -160,6 +167,9 @@ static const char *error_strings[] = {
                = "The SHA1 message digest of a WIM resource did not match the expected value",
        [WIMLIB_ERR_INVALID_RESOURCE_SIZE]
                = "A resource entry in the WIM has an invalid size",
+       [WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE]
+               = "The version of wimlib that has mounted a WIM image is incompatible with the "
+                 "version being used to unmount it",
        [WIMLIB_ERR_LINK]
                = "Failed to create a hard or symbolic link when extracting "
                        "a file from the WIM",
@@ -200,8 +210,6 @@ static const char *error_strings[] = {
                = "The WIM is part of a split WIM, which is not supported for this operation",
        [WIMLIB_ERR_STAT]
                = "Could not read the metadata for a file or directory",
-       [WIMLIB_ERR_TIMEOUT]
-               = "Timed out",
        [WIMLIB_ERR_UNKNOWN_VERSION]
                = "The WIM file is marked with an unknown version number",
        [WIMLIB_ERR_UNSUPPORTED]
@@ -282,6 +290,22 @@ static iconv_t cd_utf16_to_utf8 = (iconv_t)(-1);
 char *utf16_to_utf8(const char *utf16_str, size_t utf16_len,
                    size_t *utf8_len_ret)
 {
+#ifdef WITH_NTFS_3G
+       if (utf16_len & 1) {
+               errno = -EILSEQ;
+               return NULL;
+       }
+       char *outs = NULL;
+       int outs_len = ntfs_ucstombs((const ntfschar*)utf16_str,
+                                    utf16_len >> 1, &outs, 0);
+       if (outs_len >= 0) {
+               *utf8_len_ret = outs_len;
+       } else {
+               ERROR_WITH_ERRNO("Error converting UTF-16LE string to UTF-8");
+               outs = NULL;
+       }
+       return outs;
+#else
        if (cd_utf16_to_utf8 == (iconv_t)(-1)) {
                cd_utf16_to_utf8 = iconv_open("UTF-8", "UTF-16LE");
                if (cd_utf16_to_utf8 == (iconv_t)-1) {
@@ -314,6 +338,7 @@ char *utf16_to_utf8(const char *utf16_str, size_t utf16_len,
        *utf8_len_ret = utf8_len;
        orig_utf8_str[utf8_len] = '\0';
        return orig_utf8_str;
+#endif
 }
 
 static iconv_t cd_utf8_to_utf16 = (iconv_t)(-1);
@@ -323,6 +348,17 @@ static iconv_t cd_utf8_to_utf16 = (iconv_t)(-1);
 char *utf8_to_utf16(const char *utf8_str, size_t utf8_len,
                    size_t *utf16_len_ret)
 {
+#ifdef WITH_NTFS_3G
+       char *outs = NULL;
+       int outs_nchars = ntfs_mbstoucs(utf8_str, (ntfschar**)&outs);
+       if (outs_nchars >= 0) {
+               *utf16_len_ret = (size_t)outs_nchars * 2;
+       } else {
+               ERROR_WITH_ERRNO("Error converting UTF-8 string to UTF-16LE");
+               outs = NULL;
+       }
+       return outs;
+#else
        if (cd_utf8_to_utf16 == (iconv_t)(-1)) {
                cd_utf8_to_utf16 = iconv_open("UTF-16LE", "UTF-8");
                if (cd_utf8_to_utf16 == (iconv_t)-1) {
@@ -358,6 +394,7 @@ char *utf8_to_utf16(const char *utf8_str, size_t utf8_len,
        orig_utf16_str[utf16_len] = '\0';
        orig_utf16_str[utf16_len + 1] = '\0';
        return orig_utf16_str;
+#endif
 }
 
 static bool seeded = false;