Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Activate our own wcs*tombs()-functions.

Browse Source 
* add our own version of these functions to the build
* drop the glibc implementations of those functions
This commit is contained in:
Oliver Tappe 2011-12-12 12:20:53 +01:00
parent 995d6d827f
commit 0cf89c88d3
6 changed files with 2 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/libroot/posix/glibc/stdlib/Jamfile
View File

@ -37,5 +37,4 @@ MergeObject posix_gnu_stdlib.o :
strtod.c
strtold.c
strtof.c
wcstombs.c
;

36
src/system/libroot/posix/glibc/stdlib/wcstombs.c
View File

@ -1,36 +0,0 @@
/* Copyright (C) 1991,1992,1995,1996,1997,1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
/* Convert the `wchar_t' string in PWCS to a multibyte character string
in S, writing no more than N characters. Return the number of bytes
written, or (size_t) -1 if an invalid `wchar_t' was found. */
size_t
wcstombs (char *s, const wchar_t *pwcs, size_t n)
{
mbstate_t state;
memset (&state, '\0', sizeof state);
/* Return how many we wrote (or maybe an error). */
return __wcsrtombs (s, &pwcs, n, &state);
}

1
src/system/libroot/posix/glibc/wcsmbs/Jamfile
View File

@ -39,7 +39,6 @@ MergeObject posix_gnu_wcsmbs.o :
wcsnlen.c
wcspbrk.c
wcsrchr.c
wcsrtombs.c
wcsspn.c
wcsstr.c
wcstod.c

146
src/system/libroot/posix/glibc/wcsmbs/wcsnrtombs.c
View File

@ -1,146 +0,0 @@
/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
#include <wchar.h>
#include <wcsmbsload.h>
#include <assert.h>
#ifndef EILSEQ
# define EILSEQ EINVAL
#endif
/* This is the private state used if PS is NULL. */
static mbstate_t state;
/* This is a non-standard function but it is very useful in the
implementation of stdio because we have to deal with unterminated
buffers. At most NWC wide character will be converted. */
size_t
__wcsnrtombs (dst, src, nwc, len, ps)
char *dst;
const wchar_t **src;
size_t nwc;
size_t len;
mbstate_t *ps;
{
struct __gconv_step_data data;
const wchar_t *srcend;
int status;
size_t result;
struct __gconv_step *tomb;
const struct gconv_fcts *fcts;
/* Tell where we want the result. */
data.__invocation_counter = 0;
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
data.__trans = NULL;
if (nwc == 0)
return 0;
srcend = *src + __wcsnlen (*src, nwc - 1) + 1;
/* Get the conversion functions. */
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
/* Get the structure with the function pointers. */
tomb = fcts->tomb;
/* We have to handle DST == NULL special. */
if (dst == NULL)
{
unsigned char buf[256]; /* Just an arbitrary value. */
const wchar_t *inbuf = *src;
size_t dummy;
result = 0;
data.__outbufend = buf + sizeof (buf);
do
{
data.__outbuf = buf;
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) &inbuf,
(const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
result += data.__outbuf - buf;
}
while (status == __GCONV_FULL_OUTPUT);
if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
&& data.__outbuf[-1] == '\0')
/* Don't count the NUL character in. */
--result;
}
else
{
/* This code is based on the safe assumption that all internal
multi-byte encodings use the NUL byte only to mark the end
of the string. */
size_t dummy;
data.__outbuf = dst;
data.__outbufend = dst + len;
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) src,
(const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
result = data.__outbuf - (unsigned char *) dst;
/* We have to determine whether the last character converted
is the NUL character. */
if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
&& data.__outbuf[-1] == '\0')
{
assert (data.__outbuf != (unsigned char *) dst);
assert (__mbsinit (data.__statep));
*src = NULL;
--result;
}
}
/* There must not be any problems with the conversion but illegal input
characters. */
assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
|| status == __GCONV_ILLEGAL_INPUT
|| status == __GCONV_INCOMPLETE_INPUT
|| status == __GCONV_FULL_OUTPUT);
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
&& status != __GCONV_EMPTY_INPUT)
{
result = (size_t) -1;
__set_errno (EILSEQ);
}
return result;
}
weak_alias (__wcsnrtombs, wcsnrtombs)

146
src/system/libroot/posix/glibc/wcsmbs/wcsrtombs.c
View File

@ -1,146 +0,0 @@
/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <dlfcn.h>
#include <errno.h>
#include <stdlib.h>
#include <gconv.h>
#include <wchar.h>
#include <wcsmbsload.h>
#include <assert.h>
#ifndef EILSEQ
# define EILSEQ EINVAL
#endif
/* This is the private state used if PS is NULL. */
static mbstate_t state;
size_t
__wcsrtombs (dst, src, len, ps)
char *dst;
const wchar_t **src;
size_t len;
mbstate_t *ps;
{
struct __gconv_step_data data;
int status;
size_t result;
struct __gconv_step *tomb;
/* Tell where we want the result. */
data.__invocation_counter = 0;
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
data.__trans = NULL;
/* Make sure we use the correct function. */
update_conversion_ptrs ();
/* Get the structure with the function pointers. */
tomb = __wcsmbs_gconv_fcts.tomb;
/* We have to handle DST == NULL special. */
if (dst == NULL)
{
mbstate_t temp_state;
unsigned char buf[256]; /* Just an arbitrary value. */
const wchar_t *srcend = *src + __wcslen (*src) + 1;
const wchar_t *inbuf = *src;
size_t dummy;
temp_state = *data.__statep;
data.__statep = &temp_state;
result = 0;
data.__outbufend = buf + sizeof (buf);
do
{
data.__outbuf = buf;
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) &inbuf,
(const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
result += data.__outbuf - buf;
}
while (status == __GCONV_FULL_OUTPUT);
if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
{
/* There better should be a NUL byte at the end. */
assert (data.__outbuf[-1] == '\0');
/* Don't count the NUL character in. */
--result;
}
}
else
{
/* This code is based on the safe assumption that all internal
multi-byte encodings use the NUL byte only to mark the end
of the string. */
const wchar_t *srcend = *src + __wcsnlen (*src, len) + 1;
size_t dummy;
data.__outbuf = dst;
data.__outbufend = dst + len;
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) src,
(const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
result = data.__outbuf - (unsigned char *) dst;
/* We have to determine whether the last character converted
is the NUL character. */
if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
&& data.__outbuf[-1] == '\0')
{
assert (data.__outbuf != (unsigned char *) dst);
assert (__mbsinit (data.__statep));
*src = NULL;
--result;
}
}
/* There must not be any problems with the conversion but illegal input
characters. */
assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
|| status == __GCONV_ILLEGAL_INPUT
|| status == __GCONV_INCOMPLETE_INPUT
|| status == __GCONV_FULL_OUTPUT);
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
&& status != __GCONV_EMPTY_INPUT)
{
result = (size_t) -1;
__set_errno (EILSEQ);
}
return result;
}
weak_alias (__wcsrtombs, wcsrtombs)

2
src/system/libroot/posix/wchar/Jamfile
View File

@ -15,6 +15,8 @@ MergeObject posix_wchar.o :
mbstowcs.c
mbtowc.c
wcrtomb.cpp
wcsrtombs.cpp
wcstombs.c
wcswidth.c
wctob.c
wctomb.c