2002-05-10 Mark Bradshaw <bradshaw@staff.crosswalk.com>

	* libc/include/string.h (!__STRICT_ANSI__): Add strlcat and strlcpy.
	* libc/string/Makefile.am: Add strlcat.c and strlcpy.c.
	* libc/string/strlcat.c: New file.
	* libc/string/strlcpy.c: New file.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ac758a08916df36aa6118aa9e064f223dc49cbc2..af1b8d6f74e104052d66d40981641171b3412122 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-10  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
+
+       * libc/include/string.h (!__STRICT_ANSI__): Add strlcat and strlcpy.
+       * libc/string/Makefile.am: Add strlcat.c and strlcpy.c.
+       * libc/string/strlcat.c: New file.
+       * libc/string/strlcpy.c: New file.
+
 2002-05-10  Jeff Johnston  <jjohnstn@redhat.com>
 
        * libc/string/strchr.c: Fix comment typo.

diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index e85dac33ea6f8d3bbe1b08e91d5467c4940d448e..e29a07b30cbc3d12c3f35161b141ebdc98becec6 100644 (file)
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -61,6 +61,8 @@ char  *_EXFUN(rindex,(const char *, int));
 int     _EXFUN(strcasecmp,(const char *, const char *));
 char   *_EXFUN(strdup,(const char *));
 char   *_EXFUN(_strdup_r,(struct _reent *, const char *));
+size_t  _EXFUN(strlcat,(char *, const char *, size_t));
+size_t  _EXFUN(strlcpy,(char *, const char *, size_t));
 int     _EXFUN(strncasecmp,(const char *, const char *, size_t));
 char   *_EXFUN(strsep,(char **, const char *));
 char   *_EXFUN(strlwr,(char *));

diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index e360125000ae18ee51dc7f27a2dc43ac4e780a85..d97c1ff67e2713886bbd349e6bfe44bc8f6108dd 100644 (file)
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -23,6 +23,8 @@ LIB_SOURCES = \
        strcpy.c \
        strcspn.c \
        strerror.c \
+       strlcat.c \
+       strlcpy.c \
        strlen.c  \
        strlwr.c \
        strncat.c \

diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index afc2b83c1ded774ebbf35b0e11fd2d5aa65b2c73..b3c41e4961f8aa24eea93c2a5f7a7a3be3b8ae0c 100644 (file)
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -121,6 +121,8 @@ LIB_SOURCES = \
        strcpy.c \
        strcspn.c \
        strerror.c \
+       strlcat.c \
+       strlcpy.c \
        strlen.c  \
        strlwr.c \
        strncat.c \
@@ -177,10 +179,11 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@lib_a_OBJECTS =  bcmp.o bcopy.o bzero.o index.o \
 @USE_LIBTOOL_FALSE@memchr.o memcmp.o memcpy.o memmove.o memset.o \
 @USE_LIBTOOL_FALSE@rindex.o strcat.o strchr.o strcmp.o strcasecmp.o \
-@USE_LIBTOOL_FALSE@strcoll.o strcpy.o strcspn.o strerror.o strlen.o \
-@USE_LIBTOOL_FALSE@strlwr.o strncat.o strncmp.o strncasecmp.o strncpy.o \
-@USE_LIBTOOL_FALSE@strpbrk.o strrchr.o strspn.o strtok.o strtok_r.o \
-@USE_LIBTOOL_FALSE@strupr.o strxfrm.o strstr.o swab.o u_strerr.o
+@USE_LIBTOOL_FALSE@strcoll.o strcpy.o strcspn.o strerror.o strlcat.o \
+@USE_LIBTOOL_FALSE@strlcpy.o strlen.o strlwr.o strncat.o strncmp.o \
+@USE_LIBTOOL_FALSE@strncasecmp.o strncpy.o strpbrk.o strrchr.o strspn.o \
+@USE_LIBTOOL_FALSE@strtok.o strtok_r.o strupr.o strxfrm.o strstr.o \
+@USE_LIBTOOL_FALSE@swab.o u_strerr.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libstring_la_LIBADD = 
@@ -188,10 +191,10 @@ libstring_la_LIBADD =
 @USE_LIBTOOL_TRUE@index.lo memchr.lo memcmp.lo memcpy.lo memmove.lo \
 @USE_LIBTOOL_TRUE@memset.lo rindex.lo strcat.lo strchr.lo strcmp.lo \
 @USE_LIBTOOL_TRUE@strcasecmp.lo strcoll.lo strcpy.lo strcspn.lo \
-@USE_LIBTOOL_TRUE@strerror.lo strlen.lo strlwr.lo strncat.lo strncmp.lo \
-@USE_LIBTOOL_TRUE@strncasecmp.lo strncpy.lo strpbrk.lo strrchr.lo \
-@USE_LIBTOOL_TRUE@strspn.lo strtok.lo strtok_r.lo strupr.lo strxfrm.lo \
-@USE_LIBTOOL_TRUE@strstr.lo swab.lo u_strerr.lo
+@USE_LIBTOOL_TRUE@strerror.lo strlcat.lo strlcpy.lo strlen.lo strlwr.lo \
+@USE_LIBTOOL_TRUE@strncat.lo strncmp.lo strncasecmp.lo strncpy.lo \
+@USE_LIBTOOL_TRUE@strpbrk.lo strrchr.lo strspn.lo strtok.lo strtok_r.lo \
+@USE_LIBTOOL_TRUE@strupr.lo strxfrm.lo strstr.lo swab.lo u_strerr.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)