Deleted Added
sdiff udiff text old ( 103539 ) new ( 103676 )
full compact
fputwc.c (103539) fputwc.c (103676)
1/*-
2 * Copyright (c) 2002 Tim J. Robbins.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Tim J. Robbins.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/lib/libc/stdio/fputwc.c 103539 2002-09-18 12:17:28Z tjr $");
28__FBSDID("$FreeBSD: head/lib/libc/stdio/fputwc.c 103676 2002-09-20 13:20:41Z tjr $");
29
30#include "namespace.h"
31#include <errno.h>
32#include <limits.h>
33#include <stdio.h>
34#include <stdlib.h>
35#include <wchar.h>
36#include "un-namespace.h"
37#include "libc_private.h"
38#include "local.h"
39
29
30#include "namespace.h"
31#include <errno.h>
32#include <limits.h>
33#include <stdio.h>
34#include <stdlib.h>
35#include <wchar.h>
36#include "un-namespace.h"
37#include "libc_private.h"
38#include "local.h"
39
40/*
41 * Non-MT-safe version.
42 */
40wint_t
43wint_t
41fputwc(wchar_t wc, FILE *fp)
44__fputwc(wchar_t wc, FILE *fp)
42{
43 char buf[MB_LEN_MAX];
44 mbstate_t mbs;
45 size_t i, len;
46
45{
46 char buf[MB_LEN_MAX];
47 mbstate_t mbs;
48 size_t i, len;
49
47 FLOCKFILE(fp);
48 ORIENT(fp, 1);
49
50 if (MB_LEN_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) {
51 /*
52 * Assume single-byte locale with no special encoding.
53 * A more careful test would be to check
54 * _CurrentRuneLocale->encoding.
55 */
56 *buf = (unsigned char)wc;
57 len = 1;
58 } else {
59 memset(&mbs, 0, sizeof(mbs));
50 if (MB_LEN_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) {
51 /*
52 * Assume single-byte locale with no special encoding.
53 * A more careful test would be to check
54 * _CurrentRuneLocale->encoding.
55 */
56 *buf = (unsigned char)wc;
57 len = 1;
58 } else {
59 memset(&mbs, 0, sizeof(mbs));
60 if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) {
61 FUNLOCKFILE(fp);
60 if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1)
62 return (WEOF);
61 return (WEOF);
63 }
64 }
65
66 for (i = 0; i < len; i++)
62 }
63
64 for (i = 0; i < len; i++)
67 if (__sputc((unsigned char)buf[i], fp) == EOF) {
68 FUNLOCKFILE(fp);
65 if (__sputc((unsigned char)buf[i], fp) == EOF)
69 return (WEOF);
66 return (WEOF);
70 }
71
67
68 return ((wint_t)wc);
69}
70
71/*
72 * MT-safe version.
73 */
74wint_t
75fputwc(wchar_t wc, FILE *fp)
76{
77 wint_t r;
78
79 FLOCKFILE(fp);
80 ORIENT(fp, 1);
81 r = __fputwc(wc, fp);
72 FUNLOCKFILE(fp);
73
82 FUNLOCKFILE(fp);
83
74 return ((wint_t)wc);
84 return (r);
75}
85}