mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
233963756b
Thu Aug 8 01:41:43 1996 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile: Undo change of Tue Aug 6 14:27:11 1996. * elf/dl-support: Add definition of `_dl_sysdep_read_whole_file'. Thu Aug 8 01:15:59 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu_control.h (_FPU_DEFAULT, _FPU_IEEE): Set to 0x137f to allow long double operations. Sun Aug 4 13:12:05 1996 Richard Henderson <rth@tamu.edu> Bug Fixes: * nss/nsswitch.c (_res): Remove redundant variable definition. The real one is in resolve/res_init.c, and having both prevents using -fno-common when building the shared library. * sunrpc/rpc_prot.c (_null_auth): Same. Original is in rpc_common.c. * sysdeps/unix/sysv/linux/alpha/brk.S: When PIC, define __curbrk as a .bss object not a COMMON symbol. * sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S: Must load $gp before referencing __sigsetjmp symbol. Retain LITUSE for same. Optimizations: * sysdeps/alpha/strlen.S: Rearrange first-word setup and thense the main loop for better dual-issue on EV5. Rearrange binary search to pipeline better and trim one instruction. Cosmetic Changes: * time/localtime.c (localtime_r): Move lock declaration back next to the comment where it was before the 960724 change. * INSTALL, manual/maint.texi: alpha-gnu-linux -> alpha-ANYTHING-linux. The second word is supposed to be the hardware manufacturer. * sysdeps/alpha/_mcount.S: Retain LITUSE for __mcount. * sysdeps/alpha/setjmp.S: Retain LITUSE for __sigsetjmp_aux. * sysdeps/alpha/divrem.h: More local labels, retain LITUSE for _mcount. * sysdeps/alpha/alphaev5/add_n.S, sysdeps/alpha/alphaev5/lshift.S, sysdeps/alpha/alphaev5/rshift.S, sysdeps/alpha/alphaev5/sub_n.S: Same cleanups as with EV4 GMP stuff. Tue Jul 25 03:30:56 1996 Richard Henderson <rth@tamu.edu> * sysdeps/unix/sysv/linux/Makefile [misc] (sysdep_routines): Add clone. * sysdeps/unix/sysv/linux/alpha/clone.S: New file. * sysdeps/unix/sysv/linux/i386/clone.S: New file. Sun Aug 4 00:12:41 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/gnu/types.h: Declare __fd_mask as `unsigned long'. * misc/sys/select.h: Declare fd_mask as alias of __fd_mask. Sat Aug 3 16:20:02 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for Mikasa. * socket/sys/socket.h (send, __send, sendto): Declare buffer pointer as __const. * string/tester.c (main): Test stpncpy. * sysdeps/generic/stpncpy.c (__stpncpy): Fix so it works without segfault when called with an N that is not a multiple of four and src[N-1]=='\0'. * misc/syslog.c (LogType): New variable. (openlog): If connect() with SOCK_DGRAM fails with EPROTOTYPE, try again with SOCK_STREAM (the Linux syslogd uses a socket of the latter type). (vsyslog): When LogType==SOCK_STREAM, also send ASCII NUL terminator as a record-delimiter. If __send(LogFile) fails, call closelog() so logfile gets re-opened next time. Wed Aug 7 15:15:14 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open (_dl_open): Add cast to avoid warning. * manual/memory.texi: Improve some examples to give readers better advice: Use `stpcpy' instead of `strcat' if possible. * manual/string.texi: Document `strtok_r' and `strtok'. * sunrpc/Makefile: Move `+gccwarn' definition before inclusion of Makeconfig. [$(cross-compiling)=no]: Change test before making librpcsvc to this from $(cross-compile). Reported by Andreas Schwab. Tue Aug 6 14:27:11 1996 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile (routines): Move dl-sysdep to here... (rtld-routines): ...from here. This should make static linking work again. * locale/setlocale.c: Add local variable `lock' and add code to `setlocale' to avoid simultaneous changing of global data. * catgets/catgets.c (catopen): Use `__strdup' instead of `strdup'. * catgets/open_catalog (__open_catalog): Use `__stpcpy', `__open', `__fstat', `__read', `__mmap', `__munmap' and `__close' instead of unprotected names.
132 lines
3.0 KiB
C
132 lines
3.0 KiB
C
/* Copyright (C) 1996 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 <wchar.h>
|
|
|
|
#ifndef EILSEQ
|
|
#define EILSEQ EINVAL
|
|
#endif
|
|
|
|
|
|
static mbstate_t internal;
|
|
|
|
size_t
|
|
__mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
|
|
{
|
|
size_t used = 0;
|
|
|
|
if (ps == NULL)
|
|
ps = &internal;
|
|
|
|
if (s == NULL)
|
|
{
|
|
/* See first paragraph of description in 7.16.6.3.2. */
|
|
pwc = NULL;
|
|
s = "";
|
|
n = 1;
|
|
}
|
|
|
|
if (n > 0)
|
|
{
|
|
if (ps->count == 0)
|
|
{
|
|
unsigned char byte = (unsigned char) *s++;
|
|
++used;
|
|
|
|
/* We must look for a possible first byte of a UTF8 sequence. */
|
|
if (byte < 0x80)
|
|
{
|
|
/* One byte sequence. */
|
|
if (pwc != NULL)
|
|
*pwc = (wchar_t) byte;
|
|
return byte ? used : 0;
|
|
}
|
|
|
|
if ((byte & 0xc0) == 0x80 || (byte & 0xfe) == 0xfe)
|
|
{
|
|
/* Oh, oh. An encoding error. */
|
|
errno = EILSEQ;
|
|
return (size_t) -1;
|
|
}
|
|
|
|
if ((byte & 0xe0) == 0xc0)
|
|
{
|
|
/* We expect two bytes. */
|
|
ps->count = 1;
|
|
ps->value = byte & 0x1f;
|
|
}
|
|
else if ((byte & 0xf0) == 0xe0)
|
|
{
|
|
/* We expect three bytes. */
|
|
ps->count = 2;
|
|
ps->value = byte & 0x0f;
|
|
}
|
|
else if ((byte & 0xf8) == 0xf0)
|
|
{
|
|
/* We expect four bytes. */
|
|
ps->count = 3;
|
|
ps->value = byte & 0x07;
|
|
}
|
|
else if ((byte & 0xfc) == 0xf8)
|
|
{
|
|
/* We expect five bytes. */
|
|
ps->count = 4;
|
|
ps->value = byte & 0x03;
|
|
}
|
|
else
|
|
{
|
|
/* We expect six bytes. */
|
|
ps->count = 5;
|
|
ps->value = byte & 0x01;
|
|
}
|
|
}
|
|
|
|
/* We know we have to handle a multibyte character and there are
|
|
some more bytes to read. */
|
|
while (used < n)
|
|
{
|
|
/* The second to sixths byte must be of the form 10xxxxxx. */
|
|
unsigned char byte = (unsigned char) *s++;
|
|
++used;
|
|
|
|
if ((byte & 0xc0) != 0x80)
|
|
{
|
|
/* Oh, oh. An encoding error. */
|
|
errno = EILSEQ;
|
|
return (size_t) -1;
|
|
}
|
|
|
|
ps->value <<= 6;
|
|
ps->value |= byte & 0x3f;
|
|
|
|
if (--ps->count == 0)
|
|
{
|
|
/* The character is finished. */
|
|
if (pwc != NULL)
|
|
*pwc = (wchar_t) ps->value;
|
|
return ps->value ? used : 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
return (size_t) -2;
|
|
}
|
|
weak_alias (__mbrtowc, mbrtowc)
|