about summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-07 15:41:36 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-07 15:41:36 +0000
commit6916c5e1fa03596836767d10648a26eff9d6a8e2 (patch)
tree1afe49cb8c8096ab7f32754c90581d5961bf14d6 /wcsmbs
parent4bca4c174852bfc348f99e85684fc8f65631d125 (diff)
downloadglibc-6916c5e1fa03596836767d10648a26eff9d6a8e2.tar.gz
glibc-6916c5e1fa03596836767d10648a26eff9d6a8e2.tar.xz
glibc-6916c5e1fa03596836767d10648a26eff9d6a8e2.zip
Update.
1998-04-07 17:50  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* glibcbug.in: Report version of gcc in use.  Remove unused variable
	ENVIRONMENT.

1998-04-07  Gordon Matzigkeit  <gord@profitpress.com>

	* aclocal.m4 (LIBC_PROG_BINUTILS): Use `-print-prog-name', not
	`-print-file-name' to find as and ld.

1998-04-07  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/posix/mkstemp.c (mkstemp): Correct return value in case
	template is wrong.  Remove unused varaible `ignored'.

1998-04-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libc.map: Export __libc_sa_len.

	* iconv/gconv_conf.c (MAXPATHLEN): Define correctly.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wmemrtombs.c126
-rw-r--r--wcsmbs/wmemrtowcs.c157
2 files changed, 0 insertions, 283 deletions
diff --git a/wcsmbs/wmemrtombs.c b/wcsmbs/wmemrtombs.c
deleted file mode 100644
index 5b8e39cbe3..0000000000
--- a/wcsmbs/wmemrtombs.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.org>, 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 <wchar.h>
-
-#ifndef EILSEQ
-#define EILSEQ EINVAL
-#endif
-
-
-static const wchar_t encoding_mask[] =
-{
-  ~0x7ff, ~0xffff, ~0x1fffff, ~0x3ffffff
-};
-
-static const unsigned char encoding_byte[] =
-{
-  0xc0, 0xe0, 0xf0, 0xf8, 0xfc
-};
-
-/* 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 NWC wide character will be converted.  */
-size_t
-__wmemrtombs (dst, src, nwc, len, ps)
-     char *dst;
-     const wchar_t **src;
-     size_t nwc;
-     size_t len;
-     mbstate_t *ps;
-{
-  size_t written = 0;
-  const wchar_t *run = *src;
-
-  if (ps == NULL)
-    ps = &internal;
-
-  if (dst == NULL)
-    /* The LEN parameter has to be ignored if we don't actually write
-       anything.  */
-    len = ~0;
-
-  while (written < len && nwc-- > 0)
-    {
-      wchar_t wc;
-
-      /* Store position of first unprocessed word.  */
-      *src = run;
-
-      wc = *run++;
-
-      if (wc < 0 || wc > 0x7fffffff)
-	{
-	  /* This is no correct ISO 10646 character.  */
-	  __set_errno (EILSEQ);
-	  return (size_t) -1;
-	}
-
-      if (wc < 0x80)
-	{
-	  /* It's an one byte sequence.  */
-	  if (dst != NULL)
-	    *dst++ = (char) wc;
-	  ++written;
-	}
-      else
-	{
-	  size_t step;
-
-	  for (step = 2; step < 6; ++step)
-	    if ((wc & encoding_mask[step - 2]) == 0)
-	      break;
-
-	  if (written + step >= len)
-	    /* Too long.  */
-	    break;
-
-	  if (dst != NULL)
-	    {
-	      size_t cnt = step;
-
-	      dst[0] = encoding_byte[cnt - 2];
-
-	      --cnt;
-	      do
-		{
-		  dst[cnt] = 0x80 | (wc & 0x3f);
-		  wc >>= 6;
-		}
-	      while (--cnt > 0);
-	      dst[0] |= wc;
-
-	      dst += step;
-	    }
-
-	  written += step;
-	}
-    }
-
-  /* Store position of first unprocessed word.  */
-  *src = run;
-
-  return written;
-}
-weak_alias (__wmemrtombs, wmemrtombs)
diff --git a/wcsmbs/wmemrtowcs.c b/wcsmbs/wmemrtowcs.c
deleted file mode 100644
index 4efdd72d2e..0000000000
--- a/wcsmbs/wmemrtowcs.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.org>, 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 <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
-__wmemrtowcs (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;
-  wchar_t value;
-  size_t count;
-
-  if (ps == NULL)
-    ps = &internal;
-
-  /* Get information from last use of this state.  */
-  count = ps->count;
-  value = ps->value;
-
-  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)
-    {
-      unsigned char byte;
-
-      /* Store address of next byte to process.  */
-      *src = run;
-
-      /* Start reading a new character only if we are in the initial
-	 state.  */
-      if (count == 0)
-	{
-	  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 (run < last && count > 0)
-	{
-	  byte = *run++;
-	  --count;
-
-	  if ((byte & 0xc0) != 0x80)
-	    {
-	      /* This is an illegal encoding.  */
-	      __set_errno (EILSEQ);
-	      return (size_t) -1;
-	    }
-
-	  value <<= 6;
-	  value |= byte & 0x3f;
-	}
-
-      /* If this character is only partially available remember this.  */
-      if (run == last && count != 0)
-	{
-	  ps->count = count;
-	  ps->value = value;
-	  break;
-	}
-
-      /* Store value is required.  */
-      if (dst != NULL)
-	*dst++ = value;
-
-      /* Increment counter of produced words.  */
-      ++written;
-    }
-
-  /* Store address of next byte to process.  */
-  *src = run;
-
-  return written;
-}
-weak_alias (__wmemrtowcs, wmemrtowcs)