Deleted Added
full compact
fgetws.c (103012) fgetws.c (103523)
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/fgetws.c 103012 2002-09-06 11:24:06Z tjr $");
28__FBSDID("$FreeBSD: head/lib/libc/stdio/fgetws.c 103523 2002-09-18 05:58:11Z tjr $");
29
30#include "namespace.h"
31#include <errno.h>
29
30#include "namespace.h"
31#include <errno.h>
32#include <rune.h>
33#include <stdio.h>
34#include <wchar.h>
35#include "un-namespace.h"
36#include "libc_private.h"
37#include "local.h"
38
39wchar_t *
40fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
41{
42 wchar_t *wsp;
32#include <stdio.h>
33#include <wchar.h>
34#include "un-namespace.h"
35#include "libc_private.h"
36#include "local.h"
37
38wchar_t *
39fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
40{
41 wchar_t *wsp;
43 long r;
42 wint_t wc;
44
45 ORIENTLOCK(fp, 1);
46
47 if (n <= 0)
48 return (NULL);
49
50 wsp = ws;
51 while (n-- > 1) {
52 /* XXX Inefficient */
43
44 ORIENTLOCK(fp, 1);
45
46 if (n <= 0)
47 return (NULL);
48
49 wsp = ws;
50 while (n-- > 1) {
51 /* XXX Inefficient */
53 if ((r = fgetrune(fp)) == _INVALID_RUNE) {
54 errno = EILSEQ;
52 if ((wc = fgetwc(fp)) == WEOF && errno == EILSEQ)
55 return (NULL);
53 return (NULL);
56 }
57 if (r == EOF) {
54 if (wc == WEOF) {
58 if (wsp == ws)
59 /* EOF/error, no characters read yet. */
60 return (NULL);
61 break;
62 }
55 if (wsp == ws)
56 /* EOF/error, no characters read yet. */
57 return (NULL);
58 break;
59 }
63 *wsp++ = (wchar_t)r;
64 if (r == L'\n')
60 *wsp++ = (wchar_t)wc;
61 if (wc == L'\n')
65 break;
66 }
67 *wsp++ = L'\0';
68
69 return (ws);
70}
62 break;
63 }
64 *wsp++ = L'\0';
65
66 return (ws);
67}