Add strcat() and strncat()

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@390 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 129 insertions, 3 deletions

diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile
index 5f08c7564..9200a3dc3 100644
--- a/nuttx/lib/Makefile
+++ b/nuttx/lib/Makefile
@@ -47,9 +47,9 @@ endif
 
 STRING_SRCS	= lib_memset.c lib_memcpy.c lib_memcmp.c lib_memmove.c \
 		  lib_strcpy.c lib_strncpy.c lib_strcmp.c lib_strncmp.c \
-		  lib_strlen.c lib_strdup.c lib_strtol.c lib_strchr.c \
-		  lib_strrchr.c lib_strspn.c lib_strcspn.c lib_strtok.c \
-		  lib_strtokr.c lib_strerror.c
+		  lib_strlen.c lib_strdup.c lib_strcat.c lib_strncat.c \
+		  lib_strtol.c lib_strchr.c lib_strrchr.c lib_strspn.c \
+		  lib_strcspn.c lib_strtok.c lib_strtokr.c lib_strerror.c
 
 CTYPE_SRCS	= 
 
diff --git a/nuttx/lib/lib_internal.h b/nuttx/lib/lib_internal.h
index 1017ed560..a2dd3b36b 100644
--- a/nuttx/lib/lib_internal.h
+++ b/nuttx/lib/lib_internal.h
@@ -104,8 +104,10 @@ struct lib_rawstream_s
 
 /* Defined in lib_streamsem.c */
 
+#if CONFIG_NFILE_STREAMS > 0
 extern void  stream_semtake(FAR struct streamlist *list);
 extern void  stream_semgive(FAR struct streamlist *list);
+#endif
 
 /* Defined in lib_memstream.c */
 
diff --git a/nuttx/lib/lib_strcat.c b/nuttx/lib/lib_strcat.c
new file mode 100644
index 000000000..f14fd08a9
--- /dev/null
+++ b/nuttx/lib/lib_strcat.c
@@ -0,0 +1,62 @@
+/************************************************************
+ * lib/lib_strcat.c
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in 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 in binary form must reproduce the above copyright
+ *    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
+ *    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
+ ************************************************************/
+
+#ifndef CONFIG_ARCH_STRCAT
+char *strcat(char *dest, const char *src)
+{
+  char *ret   = dest;
+
+  dest  += strlen(dest);
+  while (*src != '\0')
+    {
+      *dest++ = *src++;
+    }
+  *dest = '\0';
+
+  return ret;
+}
+#endif
diff --git a/nuttx/lib/lib_strncat.c b/nuttx/lib/lib_strncat.c
new file mode 100644
index 000000000..7846b3b57
--- /dev/null
+++ b/nuttx/lib/lib_strncat.c
@@ -0,0 +1,62 @@
+/************************************************************
+ * lib/lib_strncat.c
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in 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 in binary form must reproduce the above copyright
+ *    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
+ *    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
+ ************************************************************/
+
+#ifndef CONFIG_ARCH_STRNCAT
+char *strncat(char *dest, const char *src, size_t n)
+{
+  char *ret   = dest;
+
+  dest  += strlen(dest);
+  for (; n > 0 && *src != '\0' ; n--)
+    {
+      *dest++ = *src++;
+    }
+  *dest = '\0';
+
+  return ret;
+}
+#endif