aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-28 08:56:59 +0000
committerRoland McGrath <roland@gnu.org>1996-06-28 08:56:59 +0000
commit6dbe2837567f528faa015fd0cf1536201dde5ffd (patch)
treed57cdf3a36d554391ae971f2f356569e85c3a1c1 /stdlib
parent47ce6a308c73d2f2bd367d4609d1bea30c9eb596 (diff)
downloadglibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.tar
glibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.tar.gz
glibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.tar.bz2
glibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.zip
Fri Jun 28 02:41:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960628
* nss/Makefile (databases): New variable. (routines, libnss_files-routines): Use it. (subdir-dirs): Compute from $(services). * sysdeps/unix/sysv/linux/syscalls.list (create_module, delete_module, init_module, klogctl): Use EXTRA in the "caller" column so these get added to unix-extra-syscalls and thus compiled in misc. * string/Makefile (routines): Add strndup. * string/strndup.c: New file. * string/string.h: Declare strndup. (strndupa): New macro. * string/string.h: Declare __strdup. * string/strdup.c: Deansideclized. Define __ name and weak alias. * string/string.h: Don't define memccpy as macro for [__OPTIMIZE__]. Thu Jun 27 23:43:22 1996 Richard Henderson <rth@tamu.edu> * sysdeps/alpha/dl-machine.h (elf_machine_rela): The Alpha's address-of operation and plt format conspire to require all dynamic relocs to be resolved to actual symbols not plt entries. Thu Jun 27 02:49:28 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Add casts to avoid signed<->unsigned warnings. * grp/initgroups.c (initgroups): De-ansi-fy. Move declaration of NGROUPS and GROUPS outside #if so that the code compiles for NGROUPS_MAX != 0. * inet/Makefile (headers): Add netinet/ether.h and netinet/if_ether.h. (routines): Add ether_aton, ether_aton_r, ether_hton, ether_line, ether_ntoa, ether_ntoa_r, and ether_ntoh. * inet/ether_aton.c, inet/ether_aton_r.c, inet/ether_hton.c, inet/ether_line.c, inet/ether_ntoa.c, inet/ether_ntoa_r.c, inet/ether_ntoh.c: New files. Implementation of functions to handle Ethernet address to host mapping. * inet/netinet/ether.h: New file. Declare ether_* functions. * netinet/ether.h: Wrapper around inet/netinet/ether.h for glibc compilation. * nss/ethers-lookup.c: New file. Lookup function for ethers database. * nss/Makefile (routines): Add ethers-lookup. (libnss_files-routines): Add files-ethers. * nss/getXXent_r.c: Don't define set*ent and end*ent function with _r suffix. * nss/nss_files/files-XXX.c (internal_endent): Don't reset KEEP_STREAM every time called. (_nss_files_end): Reset KEEP_STREAM here instead. (internal_getent): If STREAM == NULL try to open instead of signalling error. Use cast to prevent warning. Terminate read line in case the buffer is too small. * nss/nss_files/files-ethers.c: New file. Implementation of Ethernet adress<->hostname lookup through files interface. * stdlib/mbstowcs.c: Define based on mbsrtowcs(). * stdlib/mbtowc.c: Define based on mbrtowc(). * stdlib/wcstombs.c: Define based on wcsrtombs(). * stdlib/wctomb.c: Define based on wcrtomb(). * sunrpc/xdr.c (xdr_u_int): Avoid bogus call to unexpected_sizes_in_xdr_u_int. * sysdeps/generic/netinet/if_ether.h: New file. Generic declaration of `struct ether_addr'. * sysdeps/unix/sysv/linux/netinet/if_ether.h: New file. Linux specific declaration of `struct ether_addr'. * wcsmbs/mbrtowc.c: Handle case where argument PS is NULL. * wcsmbs/mbsrtowcs.c: Ditto. * wcsmbs/wcrtomb.c: Ditto. * wcsmbs/wcsrtombs.c: Ditto. * wcsmbs/mbsinit.c: Prepare for PS being NULL.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/mbstowcs.c60
-rw-r--r--stdlib/mbtowc.c84
-rw-r--r--stdlib/wcstombs.c72
-rw-r--r--stdlib/wctomb.c69
4 files changed, 75 insertions, 210 deletions
diff --git a/stdlib/mbstowcs.c b/stdlib/mbstowcs.c
index 38c710279a..8eda3ba41d 100644
--- a/stdlib/mbstowcs.c
+++ b/stdlib/mbstowcs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,62 +16,30 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include <ctype.h>
-#include <stddef.h>
#include <stdlib.h>
+#include <wchar.h>
-extern int _mb_shift; /* Defined in mbtowc.c. */
+extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */
/* Convert the string of multibyte characters in S to `wchar_t's in
PWCS, writing no more than N. Return the number written,
- or (size_t) -1 if an invalid multibyte character is encountered. */
+ or (size_t) -1 if an invalid multibyte character is encountered.
+
+ Attention: this function should NEVER be intentionally used.
+ The interface is completely stupid. The state is shared between
+ all conversion functions. You should use instead the restartable
+ version `mbsrtowcs'. */
size_t
-DEFUN(mbstowcs, (pwcs, s, n),
- register wchar_t *pwcs AND register CONST char *s AND register size_t n)
+mbstowcs (wchar_t *pwcs, const char *s, size_t n)
{
- int save_shift;
- register size_t written = 0;
-
- /* Save the shift state. */
- save_shift = _mb_shift;
- /* Reset the shift state. */
- _mb_shift = 0;
-
- while (*s != '\0')
- {
- int len;
- if (isascii (*s))
- {
- *pwcs = (wchar_t) *s;
- len = 1;
- }
- else
- len = mbtowc (pwcs, s, n);
-
- if (len < 1)
- {
- /* Return an error. */
- written = (size_t) -1;
- break;
- }
- else
- {
- /* Multibyte character converted. */
- ++pwcs;
- ++written;
- s += len;
- n -= len;
- }
- }
+ mbstate_t save_shift = __no_r_state;
+ size_t written;
- /* Terminate the string if it has space. */
- if (n > 0)
- *pwcs = (wchar_t) 0;
+ written = mbsrtowcs (pwcs, s, n, &__no_r_state);
/* Restore the old shift state. */
- _mb_shift = save_shift;
+ __no_r_state = save_shift;
/* Return how many we wrote (or maybe an error). */
return written;
diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c
index fd9449251c..c340dd72a6 100644
--- a/stdlib/mbtowc.c
+++ b/stdlib/mbtowc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,73 +16,41 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include "../locale/localeinfo.h"
-#include <ctype.h>
-#include <stddef.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <wchar.h>
-long int _mb_shift = 0;
+/* Common state for all non-restartable conversion functions. */
+mbstate_t __no_r_state;
/* Convert the multibyte character at S, which is no longer
than N characters, to its `wchar_t' representation, placing
- this n *PWC and returning its length. */
+ this n *PWC and returning its length.
+
+ Attention: this function should NEVER be intentionally used.
+ The interface is completely stupid. The state is shared between
+ all conversion functions. You should use instead the restartable
+ version `mbrtowc'. */
int
-DEFUN(mbtowc, (pwc, s, n), wchar_t *pwc AND CONST char *s AND size_t n)
+mbtowc (wchar_t *pwc, const char *s, size_t n)
{
-#if 0
- register CONST mb_char *mb;
- register wchar_t i;
-#endif
-
+ int result;
+
+ /* If S is NULL the function has to return null or not null
+ depending on the encoding having a state depending encoding or
+ not. This is nonsense because any multibyte encoding has a
+ state. The ISO C amendment 1 corrects this while introducing the
+ restartable functions. We simply say here all encodings have a
+ state. */
if (s == NULL)
- return _mb_shift != 0;
-
- if (*s == '\0')
- /* ANSI 4.10.7.2, line 19. */
- return 0;
-
- if (isascii (*s))
- {
- /* A normal ASCII character translates to itself. */
- if (pwc != NULL)
- *pwc = (wchar_t) *s;
- return 1;
- }
-
-#if 0
- if (_ctype_info->mbchar == NULL ||
- _ctype_info->mbchar->mb_chars == NULL)
- return -1;
+ return 1;
- if (n > MB_CUR_MAX)
- n = MB_CUR_MAX;
+ result = mbrtowc (pwc, s, n, &__no_r_state);
- for (i = 0; i < WCHAR_MAX; ++i)
- {
- mb = &_ctype_info->mbchar->mb_chars[i];
- /* EOF and NUL aren't MB chars. */
- if (i == (wchar_t) EOF || i == (wchar_t) '\0')
- continue;
- /* Normal ASCII values can't start MB chars. */
- else if (isascii(i))
- continue;
- else if (mb->string == NULL || mb->len == 0)
- continue;
- else if (mb->len > n)
- continue;
- else if (!strncmp(mb->string, s, mb->len))
- {
- _mb_shift += mb->shift;
- if (pwc != NULL)
- *pwc = i;
- return mb->len;
- }
- }
-#endif
+ /* The `mbrtowc' functions tell us more than we need. Fold the -1
+ and -2 result into -1. */
+ if (result < 0)
+ result = -1;
- return -1;
+ return result;
}
diff --git a/stdlib/wcstombs.c b/stdlib/wcstombs.c
index 6ddbfb1725..6518308181 100644
--- a/stdlib/wcstombs.c
+++ b/stdlib/wcstombs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,69 +16,31 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include "../locale/localeinfo.h"
-#include <ctype.h>
-#include <stddef.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <wchar.h>
+extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */
+
/* Convert the `wchar_t' string in PWCS to a multibyte character string
in S, writing no more than N characters. Return the number of bytes
- written, or (size_t) -1 if an invalid `wchar_t' was found. */
+ written, or (size_t) -1 if an invalid `wchar_t' was found.
+
+ Attention: this function should NEVER be intentionally used.
+ The interface is completely stupid. The state is shared between
+ all conversion functions. You should use instead the restartable
+ version `wcsrtombs'. */
size_t
-DEFUN(wcstombs, (s, pwcs, n),
- register char *s AND register CONST wchar_t *pwcs AND register size_t n)
+wcstombs (char *s, const wchar_t *pwcs, size_t n)
{
-#if 0
- register CONST mb_char *mb;
- register int shift = 0;
-#endif
-
- register size_t written = 0;
- register wchar_t w;
+ mbstate_t save_shift = __no_r_state;
+ size_t written;
- while ((w = *pwcs++) != (wchar_t) '\0')
- {
- if (isascii (w))
- {
- /* A normal character. */
- *s++ = (unsigned char) w;
- --n;
- ++written;
- }
- else
- {
-#if 1
- written = (size_t) -1;
- break;
-#else
- mb = &_ctype_info->mbchar->mb_chars[w + shift];
- if (mb->string == NULL || mb->len == 0)
- {
- written = (size_t) -1;
- break;
- }
- else if (mb->len > n)
- break;
- else
- {
- memcpy ((PTR) s, (CONST PTR) mb->string, mb->len);
- s += mb->len;
- n -= mb->len;
- written += mb->len;
- shift += mb->shift;
- }
-#endif
- }
- }
+ written = mbsrtowcs (pwcs, s, n, &__no_r_state);
- /* Terminate the string if it has space. */
- if (n > 0)
- *s = '\0';
+ /* Restore the old shift state. */
+ __no_r_state = save_shift;
- /* Return the number of characters written (or maybe an error). */
+ /* Return how many we wrote (or maybe an error). */
return written;
}
diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c
index 15f32ab71f..f7143add82 100644
--- a/stdlib/wctomb.c
+++ b/stdlib/wctomb.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,63 +16,30 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include "../locale/localeinfo.h"
-#include <stddef.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <wchar.h>
-extern long int _mb_shift; /* Defined in mbtowc.c. */
+extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */
/* Convert WCHAR into its multibyte character representation,
- putting this in S and returning its length. */
+ putting this in S and returning its length.
+
+ Attention: this function should NEVER be intentionally used.
+ The interface is completely stupid. The state is shared between
+ all conversion functions. You should use instead the restartable
+ version `wcrtomb'. */
int
-DEFUN(wctomb, (s, wchar), register char *s AND wchar_t wchar)
+wctomb (char *s, wchar_t wchar)
{
-#if 0
- register CONST mb_char *mb;
-
- if (_ctype_info->mbchar == NULL)
- mb = NULL;
- else
- mb = _ctype_info->mbchar->mb_chars;
-#endif
-
- /* If S is NULL, just say if we're shifted or not. */
+ /* If S is NULL the function has to return null or not null
+ depending on the encoding having a state depending encoding or
+ not. This is nonsense because any multibyte encoding has a
+ state. The ISO C amendment 1 corrects this while introducing the
+ restartable functions. We simply say here all encodings have a
+ state. */
if (s == NULL)
- return _mb_shift != 0;
-
- if (wchar == (wchar_t) '\0')
- {
- _mb_shift = 0;
- /* See ANSI 4.4.1.1, line 21. */
- if (s != NULL)
- *s = '\0';
- return 1;
- }
- else /* if (mb == NULL) */
- {
- if ((wchar_t) (char) wchar == wchar && isascii ((char) wchar))
- {
- /* A normal ASCII character translates to itself. */
- if (s != NULL)
- *s = (char) wchar;
- return 1;
- }
- return -1;
- }
+ return 1;
-#if 1
- return -1;
-#else
- mb += wchar + _mb_shift;
- if (mb->string == NULL || mb->len == 0)
- return -1;
- memcpy((PTR) s, (CONST PTR) mb->string, mb->len + 1);
- _mb_shift += mb->shift;
- return mb->len;
-#endif
+ return wcrtomb (s, wchar, &__no_r_state);
}