mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-05 21:00:05 +00:00
5aa8ff620e
1998-04-21 18:00 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv.c (__gconv): Remove bogus input buffer size computation. * iconv/gconv_open.c (__gconv_open): Initialize outbufend element. * iconv/gconv_simple.c (__gconv_transform_internal_ascii): Don't use character in comparison with uint32_t. (__gconv_transform_internal_utf8): Specify MAX_NEEDED_TO. (__gconv_transform_utf8_internal): Specify MAX_NEEDED_FROM. Optimize BODY a bit. * iconv/loop.c: Require MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT to be defined. * iconv/skeleton.c: Also reset converted counter in case of an error. Call reset function using correct value for output buffer start. * iconvdata/Makefile: Re-enable tests. * iconvdata/iso8859-1.c: Swap MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT value for to-conversion. * iconvdata/TESTS: Add new third column. * iconvdata/run-iconv-test.sh: Add support for charsets which are not ASCII based. * iconvdata/testdata/suntzus: New file. * elf/dl-minimal.c (__strtol_internal): Increment pointer to string while reading. Correctly used base. Little optimization. (__strtoul_internal): Likewise. * elf/rtld.c (dl_main): Test to avoid duplicate call of _dl_init_paths was wrong. Use explicit variable. 1998-04-20 23:49 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for awk. * config.make.in: Add AWK to be substituted. * manual/xtract-typefun.awk: Rewrite to eliminate gawk extensions. * manual/users.texi: Fix typo exposed by above rewrite. * Makefile: Invoke awk using AWK variable. * csu/Makefile: Likewise. * elf/Makefile: Likewise. * mach/Makefile: Likewise. * manual/Makefile: Likewise. * sysdeps/gnu/Makefile: Likewise. * sysdeps/mach/hurd/Makefile: Likewise. * sysdeps/unix/Makefile: Likewise. * timezone/Makefile: Likewise. 1998-04-10 Gordon Matzigkeit <gord@profitpress.com> * sysdeps/gnu/errlist.awk (ERR_REMAP): Implement error code to array index translation. (SYS_ERRLIST_ALIAS, SYS_NERR_ALIAS): Make weak aliases only if these are defined. * sysdeps/mach/hurd/Dist: Add errlist.c to distribution. * sysdeps/mach/hurd/errlist.c: New file. (ERR_TRANSLATE): Map Hurd error codes into errlist indices. (_hurd_errlist): The Hurd error list doesn't have Unix sys_errlist semantics, so rename it. 1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * iconvdata/run-iconv-test.sh: Make portable. Always test all conversions. 1998-04-21 12:30 H.J. Lu <hjl@gnu.org> * wcsmbs/wcsrtombs.c (__wcsrtombs): Initialize result to 0. * wcsmbs/wcsnrtombs.c: Likewise. 1998-04-21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/dl-sysdep.c: Handle _dl_hwcap correctly. * wcsmbs/btowc.c (__btowc): Declare inptr as const char *. * time/strftime.c (my_strftime): Initialize pad variable in declaration. * iconvdata/big5.c: Don't use character constants in comparisons with unsigned value. * sysdeps/generic/setutxent.c: New file. * sysdeps/generic/getutxent.c: New file. * sysdeps/generic/endutxent.c: New file. * sysdeps/generic/getutxid.c: New file. * sysdeps/generic/getutxline.c: New file. * sysdeps/generic/pututxline.c: New file. * sysdeps/generic/utmpxname.c: New file. * sysdeps/generic/updwtmpx.c: New file.
125 lines
3.5 KiB
C
125 lines
3.5 KiB
C
/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#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 = 0;
|
|
|
|
/* Tell where we want the result. */
|
|
data.is_last = 1;
|
|
data.statep = ps ?: &state;
|
|
|
|
/* Make sure we use the correct function. */
|
|
update_conversion_ptrs ();
|
|
|
|
/* We have to handle DST == NULL special. */
|
|
if (dst == NULL)
|
|
{
|
|
char buf[256]; /* Just an arbitrary value. */
|
|
const wchar_t *srcend = *src + __wcslen (*src) + 1;
|
|
const wchar_t *inbuf = *src;
|
|
size_t written;
|
|
|
|
data.outbuf = buf;
|
|
data.outbufend = buf + sizeof (buf);
|
|
|
|
do
|
|
{
|
|
status = (*__wcsmbs_gconv_fcts.tomb->fct) (__wcsmbs_gconv_fcts.tomb,
|
|
&data,
|
|
(const char **) &inbuf,
|
|
(const char *) srcend,
|
|
&written, 0);
|
|
result += written;
|
|
}
|
|
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. */
|
|
const wchar_t *srcend = *src + __wcsnlen (*src, len * MB_CUR_MAX) + 1;
|
|
|
|
data.outbuf = dst;
|
|
data.outbufend = dst + len;
|
|
|
|
status = (*__wcsmbs_gconv_fcts.tomb->fct) (__wcsmbs_gconv_fcts.tomb,
|
|
&data, (const char **) src,
|
|
(const char *) srcend,
|
|
&result, 0);
|
|
|
|
/* We have to determine whether the last character converted
|
|
is the NUL character. */
|
|
if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT
|
|
|| status == GCONV_FULL_OUTPUT)
|
|
&& data.outbuf[-1] == '\0')
|
|
{
|
|
assert (data.outbuf != 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)
|