On Jun 2, 2014, at 4:53 AM, Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx> wrote:
> On Jun 2, 2:00am, Jun T. wrote:
> } Subject: Re: Unicode, Korean, normalization form, Mac OS X and tab complet
> }
> } There is a patch by a Japanese user which simply converts
> } file names obtained by readder() into the composed form ("NFC")
>
> I tried this and found a couple of problems, mainly that iconv() can
> return >= 0 but do nothing if the input has no convertible characters.
> Here is my suggested correction, also eliminates unnecessary temp_name:
>
> diff --git a/Src/utils.c b/Src/utils.c
> index 9439227..8b512bb 100644
> --- a/Src/utils.c
> +++ b/Src/utils.c
> @@ -4270,6 +4270,12 @@ mod_export char *
> zreaddir(DIR *dir, int ignoredots)
> {
> struct dirent *de;
> +#if defined(HAVE_ICONV) && defined(__APPLE__)
> + static iconv_t conv_ds = (iconv_t)0;
> + static char *conv_name = 0;
> + char *conv_name_ptr, *orig_name_ptr;
> + size_t conv_name_len, orig_name_len;
> +#endif
>
> do {
> de = readdir(dir);
> @@ -4278,6 +4284,31 @@ zreaddir(DIR *dir, int ignoredots)
> } while(ignoredots && de->d_name[0] == '.' &&
> (!de->d_name[1] || (de->d_name[1] == '.' && !de->d_name[2])));
>
> +#if defined(HAVE_ICONV) && defined(__APPLE__)
> + if (!conv_ds)
> + conv_ds = iconv_open("UTF-8", "UTF-8-MAC");
> + if (conv_ds) {
> + /* Force initial state in case re-using conv_ds */
> + (void) iconv(conv_ds, 0, &orig_name_len, 0, &conv_name_len);
> +
> + orig_name_ptr = de->d_name;
> + orig_name_len = strlen(de->d_name);
> + conv_name = zrealloc(conv_name, orig_name_len+1);
> + conv_name_ptr = conv_name;
> + 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) {
> + /* Completely converted, metafy and return */
> + *conv_name_ptr = '\0';
> + return metafy(conv_name, -1, META_STATIC);
> + }
> + }
> + /* Error, or conversion incomplete, keep the original name */
> + }
> +#endif
> +
> return metafy(de->d_name, -1, META_STATIC);
> }
>
The patch is working properly so far.
Attachment:
signature.asc
Description: Message signed with OpenPGP using GPGMail