mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
4360eafdd2
1999-06-18 Zack Weinberg <zack@rabi.columbia.edu> * include/features.h: Define new macros __GNUC_PREREQ and __GLIBC_PREREQ which can be used to test the version of gcc and glibc respectively. * assert/assert.h: Use __GNUC_PREREQ. * intl/libintl.h: Likewise. * math/complex.h: Likewise. * math/tgmath.h: Likewise. * misc/sys/cdefs.h: Likewise. * posix/sys/types.h: Likewise. * socket/sys/socket.h: Likewise. * string/bits/string2.h: Likewise. * sysdeps/alpha/fpu/bits/mathinline.h: Likewise. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. 1999-06-18 Zack Weinberg <zack@rabi.columbia.edu> * include/libintl.h: Declare _libc_intl_domainname here. Define _ and N_ here. * include/libc-symbols.h: Don't include <libintl.h>. Don't define _ and N_. Don't declare _libc_intl_domainname. * Makeconfig (CPPFLAGS): Use -imacros to read libc-symbols.h. * db2/config.h: Don't include sys/stat.h or define HAVE_ST_BLKSIZE here... * db2/compat.h: ...do it here. * linuxthreads/internals.h: Include bits/libc-tsd.h after all other headers. * linuxthreads/no-tsd.c: Include sys/cdefs.h for __P. * iconv/iconv.c: Include stddef.h for NULL. * malloc/malloc.h: Include features.h. * sysdeps/generic/morecore.c: Use __malloc_ptr_t not __ptr_t. * sysdeps/unix/make_errlist.c: Write an "#include <libintl.h>" into the generated file. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Rebuilt. * assert/assert-perr.c: Include libintl.h. * assert/assert.c: Likewise. * elf/dl-open.c: Likewise. * elf/dlsym.c: Likewise. * elf/dlvsym.c: Likewise. * iconv/iconv_prog.c: Likewise. * inet/rcmd.c: Likewise. * inet/ruserpass.c: Likewise. * locale/programs/charset.c: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-messages.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/repertoire.c: Likewise. * login/programs/database.c: Likewise. * login/programs/request.c: Likewise. * malloc/mcheck.c: Likewise. * misc/error.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nis_error.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_print.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * nis/ypclnt.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nscd/cache.c: Likewise. * nscd/connections.c: Likewise. * nscd/grpcache.c: Likewise. * nscd/hstcache.c: Likewise. * nscd/nscd_conf.c: Likewise. * nscd/nscd_stat.c: Likewise. * nscd/pwdcache.c: Likewise. * posix/id.c: Likewise. * resolv/herror.c: Likewise. * stdio-common/psignal.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_main.c: Likewise. * sunrpc/rpc_scan.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sysdeps/mach/hurd/mips/dl-machine.c: Likewise. * sysdeps/posix/gai_strerror.c: Likewise. * sysdeps/unix/siglist.c: Likewise. * sysdeps/unix/sysv/linux/siglist.c: Likewise. * sysdeps/unix/sysv/linux/arm/siglist.c: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c: Likewise. * timezone/zic.c: Likewise.
94 lines
2.5 KiB
C
94 lines
2.5 KiB
C
/* Convert characters in input buffer using conversion descriptor to
|
|
output buffer.
|
|
Copyright (C) 1997, 1998, 1999 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 <stddef.h> /* for NULL */
|
|
#include <errno.h>
|
|
#include <iconv.h>
|
|
|
|
#include <gconv_int.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
size_t
|
|
iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
|
|
size_t *outbytesleft)
|
|
{
|
|
__gconv_t gcd = (__gconv_t) cd;
|
|
char *outstart = outbuf ? *outbuf : NULL;
|
|
size_t converted;
|
|
int result;
|
|
|
|
if (inbuf == NULL || *inbuf == NULL)
|
|
{
|
|
result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
|
|
(unsigned char *) (outstart + *outbytesleft),
|
|
&converted);
|
|
}
|
|
else
|
|
{
|
|
const char *instart = *inbuf;
|
|
|
|
result = __gconv (gcd, (const unsigned char **) inbuf,
|
|
(const unsigned char *) (*inbuf + *inbytesleft),
|
|
(unsigned char **) outbuf,
|
|
(unsigned char *) (*outbuf + *outbytesleft),
|
|
&converted);
|
|
|
|
*inbytesleft -= *inbuf - instart;
|
|
}
|
|
if (outstart != NULL)
|
|
*outbytesleft -= *outbuf - outstart;
|
|
|
|
switch (result)
|
|
{
|
|
case __GCONV_ILLEGAL_DESCRIPTOR:
|
|
__set_errno (EBADF);
|
|
converted = (size_t) -1L;
|
|
break;
|
|
|
|
case __GCONV_ILLEGAL_INPUT:
|
|
__set_errno (EILSEQ);
|
|
converted = (size_t) -1L;
|
|
break;
|
|
|
|
case __GCONV_FULL_OUTPUT:
|
|
__set_errno (E2BIG);
|
|
converted = (size_t) -1L;
|
|
break;
|
|
|
|
case __GCONV_INCOMPLETE_INPUT:
|
|
__set_errno (EINVAL);
|
|
converted = (size_t) -1L;
|
|
break;
|
|
|
|
case __GCONV_EMPTY_INPUT:
|
|
case __GCONV_OK:
|
|
/* Nothing. */
|
|
break;
|
|
|
|
default:
|
|
assert (!"Nothing like this should happen");
|
|
}
|
|
|
|
return converted;
|
|
}
|