mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-21 15:45:02 +00:00
Code Issues Releases Activity

Implement mbstowcs() as a wrapper around mbsrtowcs(), and wcstombs()

Browse Source 
as a wrapper around wcsrtombs().
This commit is contained in:
Tim J. Robbins 2003-08-07 08:04:01 +00:00
parent 778a4a9dd4
commit b69a98d6d3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=118593
2 changed files with 24 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lib/libc/locale/mbstowcs.c
View File

@ -1,9 +1,6 @@
/*- /*-
* Copyright (c) 1993 * Copyright (c) 2002, 2003 Tim J. Robbins.
* The Regents of the University of California. All rights reserved. * All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Paul Borman at Krystal Technologies.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -13,18 +10,11 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@ -37,52 +27,18 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <string.h>
#include <stddef.h> #include <wchar.h>
#include <rune.h>
size_t size_t
mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n) mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
{ {
const char *e;
int cnt;
rune_t r;
if (s == NULL) { /*
errno = EINVAL; * We pass NULL as the state pointer to mbsrtowcs() because we don't
return (-1); * support state-dependent encodings and don't want to waste time
} * creating a zeroed mbstate_t that will not be used.
*/
if (pwcs == NULL) { return (mbsrtowcs(pwcs, &s, n, NULL));
/* Convert and count only, do not store. */
cnt = 0;
while ((r = sgetrune(s, MB_LEN_MAX, &e)) != _INVALID_RUNE &&
r != 0) {
s = e;
cnt++;
}
if (r == _INVALID_RUNE) {
errno = EILSEQ;
return (-1);
}
return (cnt);
}
/* Convert, store and count characters. */
cnt = 0;
while (n-- > 0) {
*pwcs = sgetrune(s, MB_LEN_MAX, &e);
if (*pwcs == _INVALID_RUNE) {
errno = EILSEQ;
return (-1);
}
if (*pwcs++ == L'\0')
break;
s = e;
++cnt;
}
return (cnt);
} }

71
lib/libc/locale/wcstombs.c
View File

@ -1,9 +1,6 @@
/*- /*-
* Copyright (c) 1993 * Copyright (c) 2002, 2003 Tim J. Robbins.
* The Regents of the University of California. All rights reserved. * All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Paul Borman at Krystal Technologies.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -13,18 +10,11 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@ -37,55 +27,18 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <string.h>
#include <stddef.h> #include <wchar.h>
#include <rune.h>
size_t size_t
wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n) wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
{ {
char buf[MB_LEN_MAX];
char *e;
int cnt, nb;
if (pwcs == NULL || n > INT_MAX) { /*
errno = EINVAL; * We pass NULL as the state pointer to wcsrtombs() because we don't
return (-1); * support state-dependent encodings and don't want to waste time
} * creating a zeroed mbstate_t that will not be used.
*/
cnt = 0; return (wcsrtombs(s, &pwcs, n, NULL));
if (s == NULL) {
/* Convert and count only, do not store. */
while (*pwcs != L'\0') {
if (sputrune(*pwcs++, buf, MB_LEN_MAX, &e) == 0) {
errno = EILSEQ;
return (-1);
}
cnt += e - buf;
}
return (cnt);
}
/* Convert, store and count characters. */
nb = n;
while (nb > 0) {
if (*pwcs == L'\0') {
*s = '\0';
break;
}
if (sputrune(*pwcs++, s, nb, &e) == 0) {
errno = EILSEQ;
return (-1);
}
if (e == NULL) /* too long */
return (cnt);
cnt += e - s;
nb -= e - s;
s = e;
}
return (cnt);
} }