Deleted Added
full compact
mbrtowc.c (106725) mbrtowc.c (121845)
1/*-
1/*-
2 * Copyright (c) 2002 Tim J. Robbins.
2 * Copyright (c) 2002, 2003 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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright

--- 9 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>
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright

--- 9 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/locale/mbrtowc.c 106725 2002-11-10 10:49:14Z tjr $");
28__FBSDID("$FreeBSD: head/lib/libc/locale/mbrtowc.c 121845 2003-11-01 05:13:13Z tjr $");
29
30#include <errno.h>
31#include <rune.h>
32#include <stdlib.h>
33#include <wchar.h>
34
29
30#include <errno.h>
31#include <rune.h>
32#include <stdlib.h>
33#include <wchar.h>
34
35extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
36 size_t, mbstate_t * __restrict);
37
35size_t
38size_t
36mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
37 mbstate_t * __restrict ps __unused)
39mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
40 size_t n, mbstate_t * __restrict ps)
38{
41{
42
43 return (__mbrtowc(pwc, s, n, ps));
44}
45
46/*
47 * Emulate the ISO C mbrtowc() function in terms of the deprecated
48 * 4.4BSD sgetrune() function.
49 */
50size_t
51__emulated_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
52 size_t n, mbstate_t * __restrict ps __unused)
53{
39 const char *e;
40 rune_t r;
41
42 if (s == NULL) {
43 pwc = NULL;
44 s = "";
45 n = 1;
46 }

--- 29 unchanged lines hidden ---
54 const char *e;
55 rune_t r;
56
57 if (s == NULL) {
58 pwc = NULL;
59 s = "";
60 n = 1;
61 }

--- 29 unchanged lines hidden ---