From 254321e61b0299f2247131f1a331b6b39d13cd93 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 18 Jul 2009 20:11:11 +0000 Subject: Add strstr() git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1990 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/ChangeLog | 1 + nuttx/Documentation/NuttX.html | 1 + nuttx/lib/Makefile | 4 +- nuttx/lib/lib_strchr.c | 22 ++++----- nuttx/lib/lib_strstr.c | 104 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 15 deletions(-) create mode 100644 nuttx/lib/lib_strstr.c diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 97f299ae9..2b707f8b5 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -825,4 +825,5 @@ * examples/thttpd: A basic test program for THTTPD * configs/eagle100/thttpd: A build configuration for THTTPD on the Micromint Eagle-100 LMS6918 (Cortex-M3) board. + * lib/: Added strstr() diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index e0a815934..09b8d7566 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -1498,6 +1498,7 @@ nuttx-0.4.10 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * examples/thttpd: A basic test program for THTTPD * configs/eagle100/thttpd: A build configuration for THTTPD on the Micromint Eagle-100 LMS6918 (Cortex-M3) board. + * lib/: Added strstr() nuttx-0.4.10 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile index 27fdd3b0c..021688365 100644 --- a/nuttx/lib/Makefile +++ b/nuttx/lib/Makefile @@ -48,8 +48,8 @@ STRING_SRCS = lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memcpy.c \ lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c lib_strcspn.c \ lib_strdup.c lib_strerror.c lib_strlen.c lib_strncasecmp.c \ lib_strncat.c lib_strncmp.c lib_strncpy.c lib_strrchr.c \ - lib_strspn.c lib_strtok.c lib_strtokr.c lib_strtol.c lib_strtoll.c \ - lib_strtoul.c lib_strtoull.c + lib_strspn.c lib_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c \ + lib_strtoll.c lib_strtoul.c lib_strtoull.c CTYPE_SRCS = diff --git a/nuttx/lib/lib_strchr.c b/nuttx/lib/lib_strchr.c index 5b3426dbb..ff7c6197a 100644 --- a/nuttx/lib/lib_strchr.c +++ b/nuttx/lib/lib_strchr.c @@ -1,7 +1,7 @@ -/************************************************************ - * lib_strchr.c +/**************************************************************************** + * lib/lib_strchr.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,23 +31,19 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ - * Compilation Switches - ************************************************************/ - -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include #include #include -/************************************************************ +/**************************************************************************** * Global Functions - ************************************************************/ + ****************************************************************************/ /* The strchr() function returns a pointer to the first * occurrence of the character c in the string s. diff --git a/nuttx/lib/lib_strstr.c b/nuttx/lib/lib_strstr.c new file mode 100644 index 000000000..87b4adb9b --- /dev/null +++ b/nuttx/lib/lib_strstr.c @@ -0,0 +1,104 @@ +/**************************************************************************** + * lib/lib_strstr.ch + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use str source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions str binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer str + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +char *strstr(const char *str, const char *substr) +{ + const char *candidate; /* Candidate in str with matching start character */ + char ch; /* First character of the substring */ + int len; /* The length of the substring */ + + /* Special case the empty substring */ + + ch = *substr++; + if (!ch) + { + /* We'll say that an empty substring matches at the beginning of + * the string + */ + + return (char*)str; + } + + /* Search for the substring */ + + candidate = str; + len = strlen(substr); + + for (;;) + { + /* strchr() will return a pointer to the next occurrence of the + * character ch in the string + */ + + candidate = strchr(candidate, ch); + if (!candidate || strlen(candidate) < len) + { + /* First character of the substring does not appear in the string + * or the remainder of the string is not long enough to contain the + * substring. + */ + + return NULL; + } + + /* Check if this is the beginning of a matching substring */ + + if (strncmp(candidate, substr, len) == 0) + { + return (char*)candidate; + } + + /* No, find the next candidate after this one */ + + candidate++; + } + + /* Won't get here, but some compilers might complain */ + + return NULL; +} + -- cgit v1.2.3