Deleted Added
sdiff udiff text old ( 199784 ) new ( 227753 )
full compact
fgetws.c (199784) fgetws.c (227753)
1/*-
2 * Copyright (c) 2002-2004 Tim J. Robbins.
3 * All rights reserved.
4 *
1/*-
2 * Copyright (c) 2002-2004 Tim J. Robbins.
3 * All rights reserved.
4 *
5 * Copyright (c) 2011 The FreeBSD Foundation
6 * All rights reserved.
7 * Portions of this software were developed by David Chisnall
8 * under sponsorship from the FreeBSD Foundation.
9 *
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.

--- 7 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>
10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions
12 * are met:
13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution.

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

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/lib/libc/stdio/fgetws.c 199784 2009-11-25 04:45:45Z wollman $");
33__FBSDID("$FreeBSD: head/lib/libc/stdio/fgetws.c 227753 2011-11-20 14:45:42Z theraven $");
29
30#include "namespace.h"
31#include <errno.h>
32#include <stdio.h>
33#include <string.h>
34#include <wchar.h>
35#include "un-namespace.h"
36#include "libc_private.h"
37#include "local.h"
38#include "mblocal.h"
39
40wchar_t *
34
35#include "namespace.h"
36#include <errno.h>
37#include <stdio.h>
38#include <string.h>
39#include <wchar.h>
40#include "un-namespace.h"
41#include "libc_private.h"
42#include "local.h"
43#include "mblocal.h"
44
45wchar_t *
41fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
46fgetws_l(wchar_t * __restrict ws, int n, FILE * __restrict fp, locale_t locale)
42{
43 wchar_t *wsp;
44 size_t nconv;
45 const char *src;
46 unsigned char *nl;
47{
48 wchar_t *wsp;
49 size_t nconv;
50 const char *src;
51 unsigned char *nl;
52 FIX_LOCALE(locale);
53 struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
47
48 FLOCKFILE(fp);
49 ORIENT(fp, 1);
50
51 if (n <= 0) {
52 errno = EINVAL;
53 goto error;
54 }
55
56 if (fp->_r <= 0 && __srefill(fp))
57 /* EOF */
58 goto error;
59 wsp = ws;
60 do {
61 src = fp->_p;
62 nl = memchr(fp->_p, '\n', fp->_r);
54
55 FLOCKFILE(fp);
56 ORIENT(fp, 1);
57
58 if (n <= 0) {
59 errno = EINVAL;
60 goto error;
61 }
62
63 if (fp->_r <= 0 && __srefill(fp))
64 /* EOF */
65 goto error;
66 wsp = ws;
67 do {
68 src = fp->_p;
69 nl = memchr(fp->_p, '\n', fp->_r);
63 nconv = __mbsnrtowcs(wsp, &src,
70 nconv = l->__mbsnrtowcs(wsp, &src,
64 nl != NULL ? (nl - fp->_p + 1) : fp->_r,
65 n - 1, &fp->_mbstate);
66 if (nconv == (size_t)-1)
67 /* Conversion error */
68 goto error;
69 if (src == NULL) {
70 /*
71 * We hit a null byte. Increment the character count,

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

81 fp->_p = (unsigned char *)src;
82 n -= nconv;
83 wsp += nconv;
84 } while (wsp[-1] != L'\n' && n > 1 && (fp->_r > 0 ||
85 __srefill(fp) == 0));
86 if (wsp == ws)
87 /* EOF */
88 goto error;
71 nl != NULL ? (nl - fp->_p + 1) : fp->_r,
72 n - 1, &fp->_mbstate);
73 if (nconv == (size_t)-1)
74 /* Conversion error */
75 goto error;
76 if (src == NULL) {
77 /*
78 * We hit a null byte. Increment the character count,

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

88 fp->_p = (unsigned char *)src;
89 n -= nconv;
90 wsp += nconv;
91 } while (wsp[-1] != L'\n' && n > 1 && (fp->_r > 0 ||
92 __srefill(fp) == 0));
93 if (wsp == ws)
94 /* EOF */
95 goto error;
89 if (!__mbsinit(&fp->_mbstate))
96 if (!l->__mbsinit(&fp->_mbstate))
90 /* Incomplete character */
91 goto error;
92 *wsp = L'\0';
93 FUNLOCKFILE(fp);
94
95 return (ws);
96
97error:
98 FUNLOCKFILE(fp);
99 return (NULL);
100}
97 /* Incomplete character */
98 goto error;
99 *wsp = L'\0';
100 FUNLOCKFILE(fp);
101
102 return (ws);
103
104error:
105 FUNLOCKFILE(fp);
106 return (NULL);
107}
108wchar_t *
109fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
110{
111 return fgetws_l(ws, n, fp, __get_locale());
112}