aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
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 /wcsmbs
parent47ce6a308c73d2f2bd367d4609d1bea30c9eb596 (diff)
downloadglibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.zip
glibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.tar.gz
glibc-6dbe2837567f528faa015fd0cf1536201dde5ffd.tar.bz2
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 'wcsmbs')
-rw-r--r--wcsmbs/mbrtowc.c5
-rw-r--r--wcsmbs/mbsinit.c3
-rw-r--r--wcsmbs/mbsrtowcs.c6
-rw-r--r--wcsmbs/wcrtomb.c10
-rw-r--r--wcsmbs/wcsrtombs.c5
5 files changed, 26 insertions, 3 deletions
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 1708319..2c4b077 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -20,6 +20,8 @@ Boston, MA 02111-1307, USA. */
#include <wchar.h>
+static mbstate_t internal;
+
size_t
mbrtowc (pwc, s, n, ps)
wchar_t *pwc;
@@ -29,6 +31,9 @@ mbrtowc (pwc, s, n, ps)
{
wchar_t to_wide;
+ if (ps == NULL)
+ ps = &internal;
+
/*************************************************************\
|* This is no complete implementation. While the multi-byte *|
|* character handling is not finished this will do. *|
diff --git a/wcsmbs/mbsinit.c b/wcsmbs/mbsinit.c
index d9f0125..efbfd09 100644
--- a/wcsmbs/mbsinit.c
+++ b/wcsmbs/mbsinit.c
@@ -17,6 +17,7 @@ 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 <string.h>
#include <wchar.h>
@@ -29,5 +30,5 @@ mbsinit (ps)
|* character handling is not finished this will do. *|
\*************************************************************/
- return *ps == 0;
+ return ps == NULL || *ps == 0;
}
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index cb87938..dc026b7 100644
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -20,6 +20,8 @@ Boston, MA 02111-1307, USA. */
#include <wchar.h>
+static mbstate_t internal;
+
size_t
mbsrtowcs (dst, src, len, ps)
wchar_t *dst;
@@ -28,6 +30,10 @@ mbsrtowcs (dst, src, len, ps)
mbstate_t *ps;
{
size_t result = 0;
+
+ if (ps == NULL)
+ ps = &internal;
+
/*************************************************************\
|* This is no complete implementation. While the multi-byte *|
|* character handling is not finished this will do. *|
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index 43a2162..2703e88 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -24,19 +24,25 @@ Boston, MA 02111-1307, USA. */
#define EILSEQ EINVAL
#endif
+
+static mbstate_t internal;
+
size_t
wcrtomb (s, wc, ps)
char *s;
wchar_t wc;
mbstate_t *ps;
{
+ char fake[1];
+
+ if (ps == NULL)
+ ps = internal;
+
/*************************************************************\
|* This is no complete implementation. While the multi-byte *|
|* character handling is not finished this will do. *|
\*************************************************************/
- char fake[1];
-
if (s == NULL)
{
s = fake;
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 487237f..9f10009 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -25,6 +25,8 @@ Boston, MA 02111-1307, USA. */
#endif
+static mbstate_t internal;
+
size_t
wcsrtombs (dst, src, len, ps)
char *dst;
@@ -34,6 +36,9 @@ wcsrtombs (dst, src, len, ps)
{
size_t result = 0;
+ if (ps == NULL)
+ ps = &internal;
+
/*************************************************************\
|* This is no complete implementation. While the multi-byte *|
|* character handling is not finished this will do. *|