mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08: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.
117 lines
3.0 KiB
C
117 lines
3.0 KiB
C
/* Find matching transformation algorithms and initialize steps.
|
|
Copyright (C) 1997, 1998 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
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_int.h>
|
|
|
|
|
|
int
|
|
internal_function
|
|
__gconv_open (const char *toset, const char *fromset, gconv_t *handle)
|
|
{
|
|
struct gconv_step *steps;
|
|
size_t nsteps;
|
|
gconv_t result = NULL;
|
|
size_t cnt = 0;
|
|
int res;
|
|
|
|
res = __gconv_find_transform (toset, fromset, &steps, &nsteps);
|
|
if (res == GCONV_OK)
|
|
{
|
|
/* Allocate room for handle. */
|
|
result = (gconv_t) malloc (sizeof (struct gconv_info));
|
|
if (result == NULL)
|
|
res = GCONV_NOMEM;
|
|
else
|
|
{
|
|
/* Remember the list of steps. */
|
|
result->steps = steps;
|
|
result->nsteps = nsteps;
|
|
|
|
/* Allocate array for the step data. */
|
|
result->data = (struct gconv_step_data *)
|
|
calloc (nsteps, sizeof (struct gconv_step_data));
|
|
|
|
if (result->data == NULL)
|
|
res = GCONV_NOMEM;
|
|
else
|
|
{
|
|
/* Call all initialization functions for the transformation
|
|
step implemenations. */
|
|
struct gconv_step_data *data = result->data;
|
|
|
|
for (cnt = 0; cnt < nsteps; ++cnt)
|
|
{
|
|
/* If this is the last step we must not allocate an output
|
|
buffer. */
|
|
data[cnt].is_last = cnt == nsteps - 1;
|
|
|
|
/* We use the `mbstate_t' member in DATA. */
|
|
data[cnt].statep = &data[cnt].__state;
|
|
|
|
/* Allocate the buffer. */
|
|
if (!data[cnt].is_last)
|
|
{
|
|
size_t size = (GCONV_NCHAR_GOAL
|
|
* steps[cnt].max_needed_to);
|
|
|
|
data[cnt].outbuf = (char *) malloc (size);
|
|
if (data[cnt].outbuf == NULL)
|
|
{
|
|
res = GCONV_NOMEM;
|
|
break;
|
|
}
|
|
data[cnt].outbufend = data[cnt].outbuf + size;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (res != GCONV_OK)
|
|
{
|
|
/* Something went wrong. Free all the resources. */
|
|
int serrno = errno;
|
|
|
|
if (result != NULL)
|
|
{
|
|
if (result->data != NULL)
|
|
{
|
|
while (cnt-- > 0)
|
|
free (result->data[cnt].outbuf);
|
|
|
|
free (result->data);
|
|
}
|
|
|
|
free (result);
|
|
result = NULL;
|
|
}
|
|
|
|
__gconv_close_transform (steps, nsteps);
|
|
|
|
__set_errno (serrno);
|
|
}
|
|
|
|
*handle = result;
|
|
return res;
|
|
}
|