Libc-1082.20.4.tar.gz

[apple/libc.git] / locale / FreeBSD / wctob.c

diff --git a/locale/FreeBSD/wctob.c b/locale/FreeBSD/wctob.c
index 290f327a1fef7b5b1a93363e2c1504d2032dd5fb..130d00d636c505c38fc2046a3d3fe0609d994b5c 100644 (file)
--- a/locale/FreeBSD/wctob.c
+++ b/locale/FreeBSD/wctob.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002 Tim J. Robbins.
+ * Copyright (c) 2002-2004 Tim J. Robbins.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,17 +25,30 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wctob.c,v 1.1 2002/08/03 13:49:55 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctob.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
-#include <rune.h>
+#include "xlocale_private.h"
+
+#include <limits.h>
+#include <stdio.h>
 #include <wchar.h>
+#include "mblocal.h"
 
 int
-wctob(wint_t c)
+wctob_l(wint_t c, locale_t loc)
 {
-       char cc;
+       static const mbstate_t initial;
+       mbstate_t mbs = initial;
+       char buf[MB_LEN_MAX];
 
-       if (c == WEOF || sputrune(c, &cc, 1, NULL) != 1)
+       NORMALIZE_LOCALE(loc);
+       if (c == WEOF || loc->__lc_ctype->__wcrtomb(buf, c, &mbs, loc) != 1)
                return (EOF);
-       return ((unsigned char)cc);
+       return ((unsigned char)*buf);
+}
+
+int
+wctob(wint_t c)
+{
+       return wctob_l(c, __current_locale());
 }