Re: wcwidth autoconf bug

Re: wcwidth autoconf bug

[Jun T.]

On Mac OS X, wcwidth() is broken but __STDC_ISO_10646__ is NOT defined.

(I guess 'if defined(__APPLE__) && defined(BROKEN_WCWIDTH)' would
be enough, but just in case...)


Index: Src/compat.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/compat.c,v
retrieving revision 1.22
diff -u -r1.22 compat.c
--- Src/compat.c	7 Aug 2012 18:29:03 -0000	1.22
+++ Src/compat.c	23 Aug 2012 13:37:29 -0000
@@ -630,7 +630,7 @@
 #endif /* HAVE_STRTOUL */
 
 /**/
-#if defined(BROKEN_WCWIDTH) && defined(__STDC_ISO_10646__)
+#if defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
 
 /*
  * This is an implementation of wcwidth() and wcswidth() (defined in
@@ -949,5 +949,5 @@
 #endif /* 0 */
 
 /**/
-#endif /* BROKEN_WCWIDTH && __STDC_ISO_10646__ */
+#endif /* BROKEN_WCWIDTH && (__STDC_ISO_10646__ || __APPLE__) */
 
Index: Src/zsh.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.h,v
retrieving revision 1.183
diff -u -r1.183 zsh.h
--- Src/zsh.h	21 Aug 2012 18:03:03 -0000	1.183
+++ Src/zsh.h	23 Aug 2012 13:37:30 -0000
@@ -2681,7 +2681,7 @@
 #define MB_METASTRWIDTH(str)	mb_metastrlen(str, 1)
 #define MB_METASTRLEN2(str, widthp)	mb_metastrlen(str, widthp)
 
-#if defined(BROKEN_WCWIDTH) && defined(__STDC_ISO_10646__)
+#if defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
 #define WCWIDTH(wc)	mk_wcwidth(wc)
 #else
 #define WCWIDTH(wc)	wcwidth(wc)

wcwidth autoconf bug

[YAMAMOTO Takashi]

hi,

the conditional broken_wcwidth seems inverted.

YAMAMOTO Takashi

diff --git a/configure.ac b/configure.ac
index 6c04597..972a8e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2530,8 +2530,8 @@ if test x$zsh_cv_c_unicode_support = xyes; then
   AC_CACHE_CHECK(if the wcwidth() function is broken,
   zsh_cv_c_broken_wcwidth,
   [AC_TRY_RUN([$locale_prog],
-  zsh_cv_c_broken_wcwidth=yes,
   zsh_cv_c_broken_wcwidth=no,
+  zsh_cv_c_broken_wcwidth=yes,
   zsh_cv_c_broken_wcwidth=no)])
   if test x$zsh_cv_c_broken_wcwidth = xyes; then
     AC_DEFINE(BROKEN_WCWIDTH)

Re: wcwidth autoconf bug

[Peter Stephenson]

On Wed, 25 Jul 2012 09:03:41 +0000 (UTC)
yamt@mwd.biglobe.ne.jp (YAMAMOTO Takashi) wrote:
> the conditional broken_wcwidth seems inverted.

Not as far as I can see.  The programme is designed to return 0
(success) if it's been through all the stages of the test to see if
wcwidth is present but broken.  In that case the variable should be set
to "yes".

-- 
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/

Re: wcwidth autoconf bug

[YAMAMOTO Takashi]

hi,

> Not as far as I can see.  The programme is designed to return 0
> (success) if it's been through all the stages of the test to see if
> wcwidth is present but broken.  In that case the variable should be set
> to "yes".

ah, i misunderstood the intention of the code.
thanks for explanation.

YAMAMOTO Takashi

Re: wcwidth autoconf bug

[YAMAMOTO Takashi]

> hi,
> 
>> Not as far as I can see.  The programme is designed to return 0
>> (success) if it's been through all the stages of the test to see if
>> wcwidth is present but broken.  In that case the variable should be set
>> to "yes".
> 
> ah, i misunderstood the intention of the code.
> thanks for explanation.

even if libc wcwidth is broken in the sense of this test,
it has a far better chance to work than the alternative implementation
on non-__STDC_ISO_10646__ platforms.

YAMAMOTO Takashi

diff --git a/Src/compat.c b/Src/compat.c
index e36de32..6d08dab 100644
--- a/Src/compat.c
+++ b/Src/compat.c
@@ -630,7 +630,7 @@ strtoul(nptr, endptr, base)
 #endif /* HAVE_STRTOUL */
 
 /**/
-#ifdef BROKEN_WCWIDTH
+#if defined(BROKEN_WCWIDTH) && defined(__STDC_ISO_10646__)
 
 /*
  * This is an implementation of wcwidth() and wcswidth() (defined in
@@ -949,5 +949,5 @@ int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
 #endif /* 0 */
 
 /**/
-#endif /* BROKEN_WCWIDTH */
+#endif /* BROKEN_WCWIDTH && __STDC_ISO_10646__ */
 
diff --git a/Src/zsh.h b/Src/zsh.h
index cc3a670..afe22f0 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -2678,7 +2678,7 @@ typedef wint_t convchar_t;
 #define MB_METASTRWIDTH(str)	mb_metastrlen(str, 1)
 #define MB_METASTRLEN2(str, widthp)	mb_metastrlen(str, widthp)
 
-#ifdef BROKEN_WCWIDTH
+#if defined(BROKEN_WCWIDTH) && defined(__STDC_ISO_10646__)
 #define WCWIDTH(wc)	mk_wcwidth(wc)
 #else
 #define WCWIDTH(wc)	wcwidth(wc)

Re: wcwidth autoconf bug

[Peter Stephenson]

On Tue,  7 Aug 2012 03:12:51 +0000 (UTC)
yamt@mwd.biglobe.ne.jp (YAMAMOTO Takashi) wrote:
> even if libc wcwidth is broken in the sense of this test,
> it has a far better chance to work than the alternative implementation
> on non-__STDC_ISO_10646__ platforms.

Right, you mean the replacement wcwidth() contains explicit Unicode
characters, so if wchar_t doesn't use Unicode code points it's not doing
us a lot of good.  I've committed it, thanks.

-- 
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/