From eb61b7cad6d1eef756d6e6d08c62af1294cd5ebb Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 18 Dec 2012 20:18:28 -0600 Subject: [PATCH] Correctly return WIMLIB_ERR_ICONV_NOT_AVAILABLE --- src/add_image.c | 4 +++- src/ntfs-capture.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) 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; -- 2.43.0