Deleted Added
sdiff udiff text old ( 103539 ) new ( 103676 )
full compact
fgetwc.c (103539) fgetwc.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/fgetwc.c 103539 2002-09-18 12:17:28Z tjr $");
28__FBSDID("$FreeBSD: head/lib/libc/stdio/fgetwc.c 103676 2002-09-20 13:20:41Z tjr $");
29
30#include "namespace.h"
31#include <errno.h>
32#include <stdio.h>
33#include <stdlib.h>
34#include <wchar.h>
35#include "un-namespace.h"
36#include "libc_private.h"
37#include "local.h"
38
39static __inline wint_t __fgetwc_nbf(FILE *);
40
29
30#include "namespace.h"
31#include <errno.h>
32#include <stdio.h>
33#include <stdlib.h>
34#include <wchar.h>
35#include "un-namespace.h"
36#include "libc_private.h"
37#include "local.h"
38
39static __inline wint_t __fgetwc_nbf(FILE *);
40
41/*
42 * Non-MT-safe version.
43 */
41wint_t
44wint_t
42fgetwc(FILE *fp)
45__fgetwc(FILE *fp)
43{
44 wint_t wc;
45
46{
47 wint_t wc;
48
46 FLOCKFILE(fp);
47 ORIENT(fp, 1);
48 if (MB_CUR_MAX == 1) {
49 /*
50 * Assume we're using a single-byte locale. A safer test
51 * might be to check _CurrentRuneLocale->encoding.
52 */
53 wc = (wint_t)__sgetc(fp);
54 } else
55 wc = __fgetwc_nbf(fp);
49 if (MB_CUR_MAX == 1) {
50 /*
51 * Assume we're using a single-byte locale. A safer test
52 * might be to check _CurrentRuneLocale->encoding.
53 */
54 wc = (wint_t)__sgetc(fp);
55 } else
56 wc = __fgetwc_nbf(fp);
56 FUNLOCKFILE(fp);
57
58 return (wc);
59}
60
57
58 return (wc);
59}
60
61/*
62 * MT-safe version.
63 */
64wint_t
65fgetwc(FILE *fp)
66{
67 wint_t r;
68
69 FLOCKFILE(fp);
70 ORIENT(fp, 1);
71 r = __fgetwc(fp);
72 FUNLOCKFILE(fp);
73
74 return (r);
75}
76
61static __inline wint_t
62__fgetwc_nbf(FILE *fp)
63{
64 char buf[MB_LEN_MAX];
65 mbstate_t mbs;
66 size_t n, nconv;
67 int c;
68 wchar_t wc;

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

80 if (nconv == n)
81 return (wc);
82 else if (nconv == 0)
83 return (L'\0');
84 else if (nconv == (size_t)-1)
85 break;
86 }
87
77static __inline wint_t
78__fgetwc_nbf(FILE *fp)
79{
80 char buf[MB_LEN_MAX];
81 mbstate_t mbs;
82 size_t n, nconv;
83 int c;
84 wchar_t wc;

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

96 if (nconv == n)
97 return (wc);
98 else if (nconv == 0)
99 return (L'\0');
100 else if (nconv == (size_t)-1)
101 break;
102 }
103
88 FUNLOCKFILE(fp);
89 while (n-- != 0)
104 while (n-- != 0)
90 ungetc((unsigned char)buf[n], fp);
91 FLOCKFILE(fp);
105 __ungetc((unsigned char)buf[n], fp);
92 errno = EILSEQ;
93 return (WEOF);
94}
106 errno = EILSEQ;
107 return (WEOF);
108}