From: Eric Biggers <ebiggers3@gmail.com>
Date: Wed, 19 Dec 2012 02:18:28 +0000 (-0600)
Subject: Correctly return WIMLIB_ERR_ICONV_NOT_AVAILABLE
X-Git-Tag: v1.2.1~20
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=eb61b7cad6d1eef756d6e6d08c62af1294cd5ebb

Correctly return WIMLIB_ERR_ICONV_NOT_AVAILABLE
---

diff --git a/src/add_image.c b/src/add_image.c
index d658dc92..d10e5a33 100644
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -217,8 +217,10 @@ static int build_dentry_tree(struct dentry **root_ret,
 	if (!root) {
 		if (errno == EILSEQ)
 			return WIMLIB_ERR_INVALID_UTF8_STRING;
-		else
+		else if (errno == ENOMEM)
 			return WIMLIB_ERR_NOMEM;
+		else
+			return WIMLIB_ERR_ICONV_NOT_AVAILABLE;
 	}
 
 	inode = root->d_inode;
diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 0abbebac..a5ce6dfa 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -556,8 +556,10 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 	if (!root) {
 		if (errno == EILSEQ)
 			return WIMLIB_ERR_INVALID_UTF8_STRING;
-		else
+		else if (errno == ENOMEM)
 			return WIMLIB_ERR_NOMEM;
+		else
+			return WIMLIB_ERR_ICONV_NOT_AVAILABLE;
 	}
 	*root_p = root;