From 43ff4129ce7a6b781b873b56b9cd3ea599ecf74a Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 28 Mar 2011 14:51:28 +0000 Subject: * libc/include/string.h (strchrnul): Declare. * libc/string/strchrnul.c: New file. * libc/string/Makefile.am (ELIX_2_SOURCES): Add strchrnul.c. * libc/string/Makefile.in: Regenerate. --- newlib/ChangeLog | 7 +++++++ newlib/libc/include/string.h | 1 + newlib/libc/string/Makefile.am | 1 + newlib/libc/string/Makefile.in | 12 ++++++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) (limited to 'newlib') diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 99078dd86..f10416bc0 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2011-03-27 Yaakov Selkowitz + + * libc/include/string.h (strchrnul): Declare. + * libc/string/strchrnul.c: New file. + * libc/string/Makefile.am (ELIX_2_SOURCES): Add strchrnul.c. + * libc/string/Makefile.in: Regenerate. + 2011-03-23 Nick Clifton * libc/machine/frv/setjmp.S: Fix typo in .size directive. diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 6bfdd3f87..d83fb8ac9 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -63,6 +63,7 @@ char *_EXFUN(stpcpy,(char *, const char *)); char *_EXFUN(stpncpy,(char *, const char *, size_t)); int _EXFUN(strcasecmp,(const char *, const char *)); char *_EXFUN(strcasestr,(const char *, const char *)); +char *_EXFUN(strchrnul,(const char *, int)); char *_EXFUN(strdup,(const char *)); char *_EXFUN(_strdup_r,(struct _reent *, const char *)); char *_EXFUN(strndup,(const char *, size_t)); diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am index 561d0e5a0..82035c84a 100644 --- a/newlib/libc/string/Makefile.am +++ b/newlib/libc/string/Makefile.am @@ -85,6 +85,7 @@ ELIX_2_SOURCES = \ stpncpy.c \ strndup.c \ strcasestr.c \ + strchrnul.c \ strndup_r.c \ wcpcpy.c \ wcpncpy.c \ diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in index a6e7e2e98..001bfd40a 100644 --- a/newlib/libc/string/Makefile.in +++ b/newlib/libc/string/Makefile.in @@ -96,6 +96,7 @@ am__objects_1 = lib_a-bcopy.$(OBJEXT) lib_a-bzero.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@ lib_a-stpncpy.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@ lib_a-strndup.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@ lib_a-strcasestr.$(OBJEXT) \ +@ELIX_LEVEL_1_FALSE@ lib_a-strchrnul.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@ lib_a-strndup_r.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@ lib_a-wcpcpy.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@ lib_a-wcpncpy.$(OBJEXT) \ @@ -123,8 +124,8 @@ am__objects_4 = bcopy.lo bzero.lo index.lo memchr.lo memcmp.lo \ wmemcpy.lo wmemmove.lo wmemset.lo xpg_strerror_r.lo @ELIX_LEVEL_1_FALSE@am__objects_5 = bcmp.lo memccpy.lo mempcpy.lo \ @ELIX_LEVEL_1_FALSE@ stpcpy.lo stpncpy.lo strndup.lo \ -@ELIX_LEVEL_1_FALSE@ strcasestr.lo strndup_r.lo wcpcpy.lo \ -@ELIX_LEVEL_1_FALSE@ wcpncpy.lo wcsdup.lo +@ELIX_LEVEL_1_FALSE@ strcasestr.lo strchrnul.lo strndup_r.lo \ +@ELIX_LEVEL_1_FALSE@ wcpcpy.lo wcpncpy.lo wcsdup.lo @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_6 = memmem.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcsncasecmp.lo @@ -375,6 +376,7 @@ GENERAL_SOURCES = \ @ELIX_LEVEL_1_FALSE@ stpncpy.c \ @ELIX_LEVEL_1_FALSE@ strndup.c \ @ELIX_LEVEL_1_FALSE@ strcasestr.c \ +@ELIX_LEVEL_1_FALSE@ strchrnul.c \ @ELIX_LEVEL_1_FALSE@ strndup_r.c \ @ELIX_LEVEL_1_FALSE@ wcpcpy.c \ @ELIX_LEVEL_1_FALSE@ wcpncpy.c \ @@ -937,6 +939,12 @@ lib_a-strcasestr.o: strcasestr.c lib_a-strcasestr.obj: strcasestr.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strcasestr.obj `if test -f 'strcasestr.c'; then $(CYGPATH_W) 'strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/strcasestr.c'; fi` +lib_a-strchrnul.o: strchrnul.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.o `test -f 'strchrnul.c' || echo '$(srcdir)/'`strchrnul.c + +lib_a-strchrnul.obj: strchrnul.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.obj `if test -f 'strchrnul.c'; then $(CYGPATH_W) 'strchrnul.c'; else $(CYGPATH_W) '$(srcdir)/strchrnul.c'; fi` + lib_a-strndup_r.o: strndup_r.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strndup_r.o `test -f 'strndup_r.c' || echo '$(srcdir)/'`strndup_r.c -- cgit v1.2.3