string/FreeBSD/wcswidth.c.patch

   1 --- wcswidth.c.bsdnew   2009-11-18 18:24:40.000000000 -0800
   2 +++ wcswidth.c  2009-11-18 18:24:41.000000000 -0800
   3 @@ -38,20 +38,30 @@
   4  #include <sys/cdefs.h>
   5  __FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
   6
   7 +#include "xlocale_private.h"
   8 +
   9  #include <wchar.h>
  10
  11  int
  12 -wcswidth(const wchar_t *pwcs, size_t n)
  13 +wcswidth_l(const wchar_t *pwcs, size_t n, locale_t loc)
  14  {
  15         wchar_t wc;
  16         int len, l;
  17
  18 +       NORMALIZE_LOCALE(loc);
  19         len = 0;
  20         while (n-- > 0 && (wc = *pwcs++) != L'\0') {
  21 -               if ((l = wcwidth(wc)) < 0)
  22 +               if ((l = wcwidth_l(wc, loc)) < 0)
  23                         return (-1);
  24                 len += l;
  25         }
  26         return (len);
  27  }
  28
  29 +
  30 +int
  31 +wcswidth(const wchar_t *pwcs, size_t n)
  32 +{
  33 +       return wcswidth_l(pwcs, n, __current_locale());
  34 +}
  35 +