Libc-1439.100.3.tar.gz

[apple/libc.git] / string / FreeBSD / wcswidth.c

diff --git a/string/FreeBSD/wcswidth.c b/string/FreeBSD/wcswidth.c
index 98a095d18c0de237a62efdbd76a7a139671cc3c0..447c8e53e4358006447f6de733e63767fa918636 100644 (file)
--- a/string/FreeBSD/wcswidth.c
+++ b/string/FreeBSD/wcswidth.c
@@ -18,10 +18,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -40,22 +36,32 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.6 2002/08/20 02:06:28 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
+
+#include "xlocale_private.h"
 
 #include <wchar.h>
 
 int
-wcswidth(const wchar_t *pwcs, size_t n)
+wcswidth_l(const wchar_t *pwcs, size_t n, locale_t loc)
 {
        wchar_t wc;
        int len, l;
 
+       NORMALIZE_LOCALE(loc);
        len = 0;
        while (n-- > 0 && (wc = *pwcs++) != L'\0') {
-               if ((l = wcwidth(wc)) < 0)
+               if ((l = wcwidth_l(wc, loc)) < 0)
                        return (-1);
                len += l;
        }
        return (len);
 }
 
+
+int
+wcswidth(const wchar_t *pwcs, size_t n)
+{
+       return wcswidth_l(pwcs, n, __current_locale());
+}
+