mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
33a934a3ab
Sun Jan 26 05:41:42 1997 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 2.0. (RELEASE): Now it's "experimental". * Makefile (subdirs): Change $(malloc) to malloc. We have only one malloc implementation again. * malloc/*: Remove from GNU libc. * new-malloc/* Move to malloc/. * config.make.in (defines): Remove @USE_NEW_MALLOC@. * configure.in: Remove --enable-new-malloc option and check for malloc implementation choice. * malloc.h: We don't need to check for the implementation to use anymore. Simply include malloc/malloc.h. * malloc/Makefile (subdir): Change to malloc. * sysdeps/unix/sysv/linux/configure.in: Don't set malloc anymore. * Makefile: Add special goal to call generate only-MD5 based crypt library. * md5-crypt/Makefile: Likewise. * stdio-common/tstscanf.c: De-ANSI-declfy. Update copyright. (rounds): Change type to size_t to prevent warning. * wcsmbs/btowc.c: Reformat copyright. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/mbsinit.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcpcpy.c: Likewise. * wcsmbs/wcpncpy.c: Likewise. * wcsmbs/wcscat.c: Likewise. * wcsmbs/wcscmp.c: Likewise. * wcsmbs/wcscoll.c: Likewise. * wcsmbs/wcscpy.c: Likewise. * wcsmbs/wcscspn.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcslen.c: Likewise. * wcsmbs/wcsncat.c: Likewise. * wcsmbs/wcsncpy.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcsspn.c: Likewise. * wcsmbs/wcsstr.c: Likewise. * wcsmbs/wcstod.c: Likewise. * wcsmbs/wcstof.c: Likewise. * wcsmbs/wcstok.c: Likewise. * wcsmbs/wcstol.c: Likewise. * wcsmbs/wcstold.c: Likewise. * wcsmbs/wcstoq.c: Likewise. * wcsmbs/wcstoul.c: Likewise. * wcsmbs/wcstouq.c: Likewise. * wcsmbs/wcswidth.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wcsmbs/wctob.c: Likewise. * wcsmbs/wcwidth.c: Likewise. * wcsmbs/wcwidth.h: Likewise. * wcsmbs/wmemchr.c: Likewise. * wcsmbs/wmemcmp.c: Likewise. * wcsmbs/wmemmove.c: Likewise. * wcsmbs/wmemset.c: Likewise. Sat Jan 25 03:34:14 1997 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/termbits.h: Protect against multiple inclusion. Reported by a sun <asun@zoology.washington.edu>. Likewise for scanf4.c * stdlib/stdlib.h: Declare reentrant function from rand48 family
144 lines
3.4 KiB
C
144 lines
3.4 KiB
C
/* Copyright (C) 1996, 1997 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
|
|
|
|
|
|
/* We don't need the state really because we don't have shift states
|
|
to maintain between calls to this function. */
|
|
static mbstate_t internal;
|
|
|
|
/* This is a non-standard function but it is very useful in the
|
|
implementation of stdio because we have to deal with unterminated
|
|
buffers. At most NMC bytes will be converted. */
|
|
size_t
|
|
__mbsnrtowcs (dst, src, nmc, len, ps)
|
|
wchar_t *dst;
|
|
const char **src;
|
|
size_t nmc;
|
|
size_t len;
|
|
mbstate_t *ps;
|
|
{
|
|
size_t written = 0;
|
|
const char *run = *src;
|
|
const char *last = run + nmc;
|
|
|
|
if (ps == NULL)
|
|
ps = &internal;
|
|
|
|
if (dst == NULL)
|
|
/* The LEN parameter has to be ignored if we don't actually write
|
|
anything. */
|
|
len = ~0;
|
|
|
|
/* Copy all words. */
|
|
while (written < len && run < last)
|
|
{
|
|
wchar_t value;
|
|
size_t count;
|
|
unsigned char byte = *run++;
|
|
|
|
/* We expect a start of a new multibyte character. */
|
|
if (byte < 0x80)
|
|
{
|
|
/* One byte sequence. */
|
|
count = 0;
|
|
value = byte;
|
|
}
|
|
else if ((byte & 0xe0) == 0xc0)
|
|
{
|
|
count = 1;
|
|
value = byte & 0x1f;
|
|
}
|
|
else if ((byte & 0xf0) == 0xe0)
|
|
{
|
|
/* We expect three bytes. */
|
|
count = 2;
|
|
value = byte & 0x0f;
|
|
}
|
|
else if ((byte & 0xf8) == 0xf0)
|
|
{
|
|
/* We expect four bytes. */
|
|
count = 3;
|
|
value = byte & 0x07;
|
|
}
|
|
else if ((byte & 0xfc) == 0xf8)
|
|
{
|
|
/* We expect five bytes. */
|
|
count = 4;
|
|
value = byte & 0x03;
|
|
}
|
|
else if ((byte & 0xfe) == 0xfc)
|
|
{
|
|
/* We expect six bytes. */
|
|
count = 5;
|
|
value = byte & 0x01;
|
|
}
|
|
else
|
|
{
|
|
/* This is an illegal encoding. */
|
|
__set_errno (EILSEQ);
|
|
return (size_t) -1;
|
|
}
|
|
|
|
/* Read the possible remaining bytes. */
|
|
while (count-- > 0)
|
|
{
|
|
byte = *run++;
|
|
|
|
if ((byte & 0xc0) != 0x80)
|
|
{
|
|
/* This is an illegal encoding. */
|
|
__set_errno (EILSEQ);
|
|
return (size_t) -1;
|
|
}
|
|
|
|
value <<= 6;
|
|
value |= byte & 0x3f;
|
|
}
|
|
|
|
/* Store value is required. */
|
|
if (dst != NULL)
|
|
*dst++ = value;
|
|
|
|
/* The whole sequence is read. Check whether end of string is
|
|
reached. */
|
|
if (value == L'\0')
|
|
{
|
|
/* Found the end of the string. */
|
|
*src = NULL;
|
|
return written;
|
|
}
|
|
|
|
/* Increment counter of produced words. */
|
|
++written;
|
|
}
|
|
|
|
/* Store address of next byte to process. */
|
|
*src = run;
|
|
|
|
return written;
|
|
}
|
|
weak_alias (__mbsnrtowcs, mbsnrtowcs)
|