1998-04-01 19:44:34 +02:00
|
|
|
/* Conversion to and from the various ISO 646 CCS.
|
|
|
|
Copyright (C) 1998 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
|
|
|
|
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. */
|
|
|
|
|
1998-04-02 14:44:17 +02:00
|
|
|
/* The implementation of the conversion which can be performed by this
|
|
|
|
module are not very sophisticated and not tuned at all. There are
|
|
|
|
zillions of ISO 646 derivates and supporting them all in a separate
|
|
|
|
module is overkill since these coded character sets are hardly ever
|
|
|
|
used anymore (except ANSI_X3.4-1968 == ASCII, which is compatible
|
|
|
|
with ISO 8859-1). The European variants are superceded by the
|
|
|
|
various ISO 8859-? standards and the Asian variants are embedded in
|
|
|
|
larger character sets. Therefore this implementation is simply
|
|
|
|
here to make it possible to do the conversion if it is necessary.
|
|
|
|
The cost in the gconv-modules file is set to `2' and therefore
|
|
|
|
allows one to easily provide a tuned implementation in case this
|
|
|
|
proofs to be necessary. */
|
|
|
|
|
1998-04-01 19:44:34 +02:00
|
|
|
#include <gconv.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
/* Direction of the transformation. */
|
|
|
|
enum direction
|
|
|
|
{
|
1998-04-02 14:44:17 +02:00
|
|
|
illegal_dir,
|
1998-04-01 19:44:34 +02:00
|
|
|
to_iso646,
|
|
|
|
from_iso646
|
|
|
|
};
|
|
|
|
|
|
|
|
enum variant
|
|
|
|
{
|
1998-04-02 14:44:17 +02:00
|
|
|
illegal_var,
|
1998-04-01 19:44:34 +02:00
|
|
|
US, /* ANSI_X3.4-1968 */
|
|
|
|
GB, /* BS_4730 */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct iso646_data
|
|
|
|
{
|
|
|
|
enum direction dir;
|
|
|
|
enum variant var;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
int
|
1998-04-04 09:25:25 +02:00
|
|
|
gconv_init (struct gconv_step *step)
|
1998-04-01 19:44:34 +02:00
|
|
|
{
|
|
|
|
/* Determine which direction. */
|
|
|
|
struct iso646_data *new_data;
|
|
|
|
enum direction dir;
|
|
|
|
enum variant var;
|
|
|
|
int result;
|
|
|
|
|
|
|
|
if (strcasestr (step->from_name, "ANSI_X3.4-1968") != NULL)
|
|
|
|
{
|
|
|
|
dir = from_iso646;
|
|
|
|
var = US;
|
|
|
|
}
|
|
|
|
else if (strcasestr (step->from_name, "BS_4730") != NULL)
|
|
|
|
{
|
|
|
|
dir = from_iso646;
|
|
|
|
var = GB;
|
|
|
|
}
|
|
|
|
else if (strcasestr (step->to_name, "ANSI_X3.4-1968") != NULL)
|
|
|
|
{
|
|
|
|
dir = to_iso646;
|
|
|
|
var = US;
|
|
|
|
}
|
|
|
|
else if (strcasestr (step->to_name, "BS_4730") != NULL)
|
|
|
|
{
|
|
|
|
dir = to_iso646;
|
|
|
|
var = GB;
|
|
|
|
}
|
|
|
|
else
|
1998-04-02 14:44:17 +02:00
|
|
|
{
|
|
|
|
dir = illegal_dir;
|
|
|
|
var = illegal_var;
|
|
|
|
}
|
1998-04-01 19:44:34 +02:00
|
|
|
|
|
|
|
result = GCONV_NOCONV;
|
1998-04-02 14:44:17 +02:00
|
|
|
if (dir != illegal_dir
|
1998-04-01 19:44:34 +02:00
|
|
|
&& ((new_data
|
|
|
|
= (struct iso646_data *) malloc (sizeof (struct iso646_data)))
|
|
|
|
!= NULL))
|
|
|
|
{
|
|
|
|
new_data->dir = dir;
|
|
|
|
new_data->var = var;
|
1998-04-04 09:25:25 +02:00
|
|
|
step->data = new_data;
|
1998-04-01 19:44:34 +02:00
|
|
|
result = GCONV_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
1998-04-04 09:25:25 +02:00
|
|
|
gconv_end (struct gconv_step *data)
|
1998-04-01 19:44:34 +02:00
|
|
|
{
|
|
|
|
free (data->data);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
gconv (struct gconv_step *step, struct gconv_step_data *data,
|
|
|
|
const char *inbuf, size_t *inbufsize, size_t *written, int do_flush)
|
|
|
|
{
|
|
|
|
struct gconv_step *next_step = step + 1;
|
|
|
|
struct gconv_step_data *next_data = data + 1;
|
|
|
|
gconv_fct fct = next_step->fct;
|
|
|
|
size_t do_write;
|
|
|
|
int result;
|
|
|
|
|
|
|
|
/* If the function is called with no input this means we have to reset
|
|
|
|
to the initial state. The possibly partly converted input is
|
|
|
|
dropped. */
|
|
|
|
if (do_flush)
|
|
|
|
{
|
|
|
|
do_write = 0;
|
|
|
|
|
|
|
|
/* Call the steps down the chain if there are any. */
|
|
|
|
if (data->is_last)
|
|
|
|
result = GCONV_OK;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct gconv_step *next_step = step + 1;
|
|
|
|
struct gconv_step_data *next_data = data + 1;
|
|
|
|
|
|
|
|
result = (*fct) (next_step, next_data, NULL, 0, written, 1);
|
|
|
|
|
|
|
|
/* Clear output buffer. */
|
|
|
|
data->outbufavail = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1998-04-04 09:25:25 +02:00
|
|
|
enum direction dir = ((struct iso646_data *) step->data)->dir;
|
|
|
|
enum variant var = ((struct iso646_data *) step->data)->var;
|
1998-04-01 19:44:34 +02:00
|
|
|
|
|
|
|
do_write = 0;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
result = GCONV_OK;
|
|
|
|
|
|
|
|
if (dir == from_iso646)
|
|
|
|
{
|
|
|
|
size_t inchars = *inbufsize;
|
|
|
|
size_t outwchars = data->outbufavail;
|
|
|
|
char *outbuf = data->outbuf;
|
|
|
|
size_t cnt = 0;
|
|
|
|
|
|
|
|
while (cnt < inchars
|
|
|
|
&& (outwchars + sizeof (wchar_t) <= data->outbufsize))
|
|
|
|
{
|
|
|
|
switch ((unsigned char) inbuf[cnt])
|
|
|
|
{
|
|
|
|
case '\x23':
|
|
|
|
if (var == GB)
|
|
|
|
*((wchar_t *) (outbuf + outwchars)) = 0xa3;
|
|
|
|
else
|
|
|
|
*((wchar_t *) (outbuf + outwchars)) = 0x23;
|
|
|
|
break;
|
|
|
|
case '\x75':
|
|
|
|
if (var == GB)
|
|
|
|
*((wchar_t *) (outbuf + outwchars)) = 0x203e;
|
|
|
|
else
|
|
|
|
*((wchar_t *) (outbuf + outwchars)) = 0x75;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*((wchar_t *) (outbuf + outwchars)) =
|
|
|
|
(unsigned char) inbuf[cnt];
|
1998-04-02 14:44:17 +02:00
|
|
|
case '\x80' ... '\xff':
|
|
|
|
/* Illegal character. */
|
|
|
|
result = GCONV_ILLEGAL_INPUT;
|
|
|
|
goto out_from;
|
1998-04-01 19:44:34 +02:00
|
|
|
}
|
|
|
|
++do_write;
|
|
|
|
outwchars += sizeof (wchar_t);
|
|
|
|
++cnt;
|
|
|
|
}
|
1998-04-02 14:44:17 +02:00
|
|
|
out_from:
|
1998-04-01 19:44:34 +02:00
|
|
|
*inbufsize -= cnt;
|
1998-04-15 19:02:23 +02:00
|
|
|
inbuf += cnt;
|
1998-04-01 19:44:34 +02:00
|
|
|
data->outbufavail = outwchars;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
size_t inwchars = *inbufsize;
|
|
|
|
size_t outchars = data->outbufavail;
|
1998-04-02 14:44:17 +02:00
|
|
|
unsigned char *outbuf = data->outbuf;
|
1998-04-01 19:44:34 +02:00
|
|
|
size_t cnt = 0;
|
|
|
|
|
|
|
|
while (inwchars >= cnt + sizeof (wchar_t)
|
|
|
|
&& outchars < data->outbufsize)
|
|
|
|
{
|
1998-04-02 14:44:17 +02:00
|
|
|
switch (*((wchar_t *) (inbuf + cnt)))
|
|
|
|
{
|
|
|
|
case 0x23:
|
|
|
|
if (var == GB)
|
|
|
|
goto out_to;
|
|
|
|
outbuf[outchars] = 0x23;
|
|
|
|
break;
|
|
|
|
case 0x75:
|
|
|
|
if (var == GB)
|
|
|
|
goto out_to;
|
|
|
|
outbuf[outchars] = 0x75;
|
|
|
|
break;
|
|
|
|
case 0xa3:
|
|
|
|
if (var != GB)
|
|
|
|
goto out_to;
|
|
|
|
outbuf[outchars] = 0x23;
|
|
|
|
break;
|
|
|
|
case 0x203e:
|
|
|
|
if (var != GB)
|
|
|
|
goto out_to;
|
|
|
|
outbuf[outchars] = 0x75;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (*((wchar_t *) (inbuf + cnt)) > 0x7f)
|
|
|
|
goto out_to;
|
|
|
|
outbuf[outchars] =
|
|
|
|
(unsigned char) *((wchar_t *) (inbuf + cnt));
|
|
|
|
break;
|
|
|
|
}
|
1998-04-01 19:44:34 +02:00
|
|
|
|
|
|
|
++do_write;
|
|
|
|
++outchars;
|
|
|
|
cnt += sizeof (wchar_t);
|
|
|
|
}
|
1998-04-02 14:44:17 +02:00
|
|
|
out_to:
|
1998-04-01 19:44:34 +02:00
|
|
|
*inbufsize -= cnt;
|
1998-04-15 19:02:23 +02:00
|
|
|
inbuf += cnt;
|
1998-04-01 19:44:34 +02:00
|
|
|
data->outbufavail = outchars;
|
|
|
|
|
|
|
|
if (outchars < data->outbufsize)
|
|
|
|
{
|
|
|
|
/* If there is still room in the output buffer something
|
|
|
|
is wrong with the input. */
|
|
|
|
if (inwchars >= cnt + sizeof (wchar_t))
|
|
|
|
{
|
|
|
|
/* An error occurred. */
|
|
|
|
result = GCONV_ILLEGAL_INPUT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (inwchars != cnt)
|
|
|
|
{
|
|
|
|
/* There are some unprocessed bytes at the end of the
|
|
|
|
input buffer. */
|
|
|
|
result = GCONV_INCOMPLETE_INPUT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result != GCONV_OK)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (data->is_last)
|
|
|
|
{
|
|
|
|
/* This is the last step. */
|
|
|
|
result = (*inbufsize > (dir == from_iso646
|
|
|
|
? 0 : sizeof (wchar_t) - 1)
|
|
|
|
? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Status so far. */
|
|
|
|
result = GCONV_EMPTY_INPUT;
|
|
|
|
|
|
|
|
if (data->outbufavail > 0)
|
|
|
|
{
|
|
|
|
/* Call the functions below in the chain. */
|
|
|
|
size_t newavail = data->outbufavail;
|
|
|
|
|
|
|
|
result = (*fct) (next_step, next_data, data->outbuf, &newavail,
|
|
|
|
written, 0);
|
|
|
|
|
|
|
|
/* Correct the output buffer. */
|
|
|
|
if (newavail != data->outbufavail && newavail > 0)
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 20:41:05 +02:00
|
|
|
memmove (data->outbuf,
|
|
|
|
&data->outbuf[data->outbufavail - newavail],
|
|
|
|
newavail);
|
|
|
|
data->outbufavail = newavail;
|
1998-04-01 19:44:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
while (*inbufsize > 0 && result == GCONV_EMPTY_INPUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (written != NULL && data->is_last)
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 20:41:05 +02:00
|
|
|
*written += do_write;
|
1998-04-01 19:44:34 +02:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|