5 files changed, 91 insertions, 6 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2b707f8b5..4ee0bd03f 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -825,5 +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()
+	* lib/: Added strstr() and strpbrk().
 
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 09b8d7566..ec84e3b4d 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -1498,7 +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()
+	* lib/: Added strstr() and strpbrk().
 
 nuttx-0.4.10 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
 
diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile
index 021688365..221d24266 100644
--- a/nuttx/lib/Makefile
+++ b/nuttx/lib/Makefile
@@ -47,9 +47,9 @@ STRING_SRCS	= lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memcpy.c \
 		  lib_memcmp.c lib_memmove.c lib_skipspace.c lib_strcasecmp.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_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c \
-		  lib_strtoll.c lib_strtoul.c lib_strtoull.c
+		  lib_strncat.c lib_strncmp.c lib_strncpy.c lib_strpbrk.c \
+		  lib_strrchr.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_strpbrk.c b/nuttx/lib/lib_strpbrk.c
new file mode 100644
index 000000000..2c6565d2f
--- /dev/null
+++ b/nuttx/lib/lib_strpbrk.c
@@ -0,0 +1,85 @@
+/****************************************************************************
+ * lib/lib_strpbrk.pcs
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 <nuttx/config.h>
+#include <sys/types.h>
+#include <string.h>
+
+/****************************************************************************
+ * Global Functions
+ ****************************************************************************/
+
+char *strpbrk(const char *str, const char *charset)
+{
+  /* Sanity checking */
+
+#ifdef CONFIG_DEBUG
+  if (!str || !charset)
+    {
+      return NULL;
+    }
+#endif
+    
+  /* Check each character in the string */
+
+  while (*str)
+    {
+      /* Check if the character from the string matches any character in the charset */
+
+      if (strchr(charset, *str) != NULL)
+        {
+          /* Yes, then this position must be the first occurrence in string */
+
+          return (char*)str;
+	}
+
+      /* This character from the strings matches none of those in the charset.
+       * Try the next character from the string.
+       */
+
+      str++;
+    }
+
+  /* We have looked at every character in the string, and none of them match any of
+   * the characters in charset.
+   */
+
+  return NULL;
+}
+
diff --git a/nuttx/lib/lib_strstr.c b/nuttx/lib/lib_strstr.c
index 87b4adb9b..3649a6ac8 100644
--- a/nuttx/lib/lib_strstr.c
+++ b/nuttx/lib/lib_strstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_strstr.ch
+ * lib/lib_strstr.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>