Libc-1439.100.3.tar.gz

[apple/libc.git] / stdio / FreeBSD / fputwc.c

diff --git a/stdio/FreeBSD/fputwc.c b/stdio/FreeBSD/fputwc.c
index 55b02fa565b84a6426c19675efc2439bbf8011a5..e835bc27d5a83af61148fe79bd9f9207fc279c1f 100644 (file)
--- a/stdio/FreeBSD/fputwc.c
+++ b/stdio/FreeBSD/fputwc.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
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -25,7 +25,9 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.5 2002/10/16 12:09:43 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.11 2008/04/17 22:17:53 jhb Exp $");
+
+#include "xlocale_private.h"

 
 #include "namespace.h"
 #include <errno.h>
 
 #include "namespace.h"
 #include <errno.h>


@@ -36,18 +38,19 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.5 2002/10/16 12:09:43 tjr Ex
 #include "un-namespace.h"
 #include "libc_private.h"
 #include "local.h"
 #include "un-namespace.h"
 #include "libc_private.h"
 #include "local.h"

+#include "mblocal.h"

 
 /*
  * Non-MT-safe version.
  */
 
 /*
  * Non-MT-safe version.
  */

-wint_t
-__fputwc(wchar_t wc, FILE *fp)
+__private_extern__ wint_t
+__fputwc(wchar_t wc, FILE *fp, locale_t loc)

 {
        char buf[MB_LEN_MAX];
 {
        char buf[MB_LEN_MAX];

-       mbstate_t mbs;

        size_t i, len;
        size_t i, len;

+       struct __xlocale_st_runelocale *xrl = loc->__lc_ctype;

 
 

-       if (MB_LEN_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) {
+       if (xrl->__mb_cur_max == 1 && wc > 0 && wc <= UCHAR_MAX) {

                /*
                 * Assume single-byte locale with no special encoding.
                 * A more careful test would be to check
                /*
                 * Assume single-byte locale with no special encoding.
                 * A more careful test would be to check


@@ -56,8 +59,7 @@ __fputwc(wchar_t wc, FILE *fp)
                *buf = (unsigned char)wc;
                len = 1;
        } else {
                *buf = (unsigned char)wc;
                len = 1;
        } else {

-               memset(&mbs, 0, sizeof(mbs));
-               if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) {
+               if ((len = loc->__lc_ctype->__wcrtomb(buf, wc, &fp->_mbstate, loc)) == (size_t)-1) {

                        fp->_flags |= __SERR;
                        return (WEOF);
                }
                        fp->_flags |= __SERR;
                        return (WEOF);
                }


@@ -80,7 +82,21 @@ fputwc(wchar_t wc, FILE *fp)
 
        FLOCKFILE(fp);
        ORIENT(fp, 1);
 
        FLOCKFILE(fp);
        ORIENT(fp, 1);

-       r = __fputwc(wc, fp);
+       r = __fputwc(wc, fp, __current_locale());
+       FUNLOCKFILE(fp);
+
+       return (r);
+}
+
+wint_t
+fputwc_l(wchar_t wc, FILE *fp, locale_t loc)
+{
+       wint_t r;
+
+       NORMALIZE_LOCALE(loc);
+       FLOCKFILE(fp);
+       ORIENT(fp, 1);
+       r = __fputwc(wc, fp, loc);

        FUNLOCKFILE(fp);
 
        return (r);
        FUNLOCKFILE(fp);
 
        return (r);