Re: Unicode, Korean, normalization form, Mac OS X and tab completion

[Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx>]

On Jun 5, 11:34pm, Jun T. wrote:
}
} It seems we need to cast the return value of iconv() to a "signed" integer
} for correctly detecting the error.

Hmm.  That may explain something else.  I suggest this instead:


diff --git a/Src/utils.c b/Src/utils.c
index 8b512bb..59b9435 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4287,7 +4287,7 @@ zreaddir(DIR *dir, int ignoredots)
 #if defined(HAVE_ICONV) && defined(__APPLE__)
     if (!conv_ds)
 	conv_ds = iconv_open("UTF-8", "UTF-8-MAC");
-    if (conv_ds) {
+    if (conv_ds != (iconv_t)(-1)) {
 	/* Force initial state in case re-using conv_ds */
 	(void) iconv(conv_ds, 0, &orig_name_len, 0, &conv_name_len);
 
@@ -4298,12 +4298,11 @@ zreaddir(DIR *dir, int ignoredots)
 	conv_name_len = orig_name_len;
 	if (iconv(conv_ds,
 		  &orig_name_ptr, &orig_name_len,
-		  &conv_name_ptr, &conv_name_len) >= 0) {
-	  if (orig_name_len == 0) {
+		  &conv_name_ptr, &conv_name_len) != (size_t)(-1) &&
+	    orig_name_len == 0) {
 	    /* Completely converted, metafy and return */
 	    *conv_name_ptr = '\0';
 	    return metafy(conv_name, -1, META_STATIC);
-	  }
 	}
 	/* Error, or conversion incomplete, keep the original name */
     }