From ab0a643cd2f17573c35538368c2070c55f638a66 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Wed, 30 Mar 2011 19:51:19 +0000
Subject: [PATCH] Move string.h functions in lib/ to lib/string

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3439 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 nuttx/drivers/Makefile                   |  4 +-
 nuttx/include/string.h                   |  2 +-
 nuttx/lib/Makefile                       | 73 ++++++++++++------------
 nuttx/lib/string/Make.defs               | 43 ++++++++++++++
 nuttx/lib/{ => string}/lib_checkbase.c   |  4 +-
 nuttx/lib/{ => string}/lib_isbasedigit.c |  4 +-
 nuttx/lib/{ => string}/lib_memcmp.c      |  4 +-
 nuttx/lib/{ => string}/lib_memcpy.c      |  4 +-
 nuttx/lib/{ => string}/lib_memmove.c     |  4 +-
 nuttx/lib/{ => string}/lib_memset.c      |  4 +-
 nuttx/lib/{ => string}/lib_skipspace.c   |  4 +-
 nuttx/lib/{ => string}/lib_strcasecmp.c  |  4 +-
 nuttx/lib/{ => string}/lib_strcat.c      |  4 +-
 nuttx/lib/{ => string}/lib_strchr.c      |  4 +-
 nuttx/lib/{ => string}/lib_strcmp.c      |  4 +-
 nuttx/lib/{ => string}/lib_strcpy.c      |  4 +-
 nuttx/lib/{ => string}/lib_strcspn.c     |  4 +-
 nuttx/lib/{ => string}/lib_strdup.c      |  4 +-
 nuttx/lib/{ => string}/lib_strerror.c    |  4 +-
 nuttx/lib/{ => string}/lib_strlen.c      |  4 +-
 nuttx/lib/{ => string}/lib_strncasecmp.c |  4 +-
 nuttx/lib/{ => string}/lib_strncat.c     |  4 +-
 nuttx/lib/{ => string}/lib_strncmp.c     |  0
 nuttx/lib/{ => string}/lib_strncpy.c     |  4 +-
 nuttx/lib/{ => string}/lib_strnlen.c     |  2 +-
 nuttx/lib/{ => string}/lib_strpbrk.c     |  4 +-
 nuttx/lib/{ => string}/lib_strrchr.c     |  4 +-
 nuttx/lib/{ => string}/lib_strspn.c      |  4 +-
 nuttx/lib/{ => string}/lib_strstr.c      |  4 +-
 nuttx/lib/{ => string}/lib_strtod.c      |  7 +--
 nuttx/lib/{ => string}/lib_strtok.c      |  4 +-
 nuttx/lib/{ => string}/lib_strtokr.c     |  4 +-
 nuttx/lib/{ => string}/lib_strtol.c      |  4 +-
 nuttx/lib/{ => string}/lib_strtoll.c     |  4 +-
 nuttx/lib/{ => string}/lib_strtoul.c     |  4 +-
 nuttx/lib/{ => string}/lib_strtoull.c    |  4 +-
 36 files changed, 143 insertions(+), 104 deletions(-)
 create mode 100644 nuttx/lib/string/Make.defs
 rename nuttx/lib/{ => string}/lib_checkbase.c (97%)
 rename nuttx/lib/{ => string}/lib_isbasedigit.c (97%)
 rename nuttx/lib/{ => string}/lib_memcmp.c (96%)
 rename nuttx/lib/{ => string}/lib_memcpy.c (96%)
 rename nuttx/lib/{ => string}/lib_memmove.c (96%)
 rename nuttx/lib/{ => string}/lib_memset.c (96%)
 rename nuttx/lib/{ => string}/lib_skipspace.c (96%)
 rename nuttx/lib/{ => string}/lib_strcasecmp.c (95%)
 rename nuttx/lib/{ => string}/lib_strcat.c (93%)
 rename nuttx/lib/{ => string}/lib_strchr.c (96%)
 rename nuttx/lib/{ => string}/lib_strcmp.c (96%)
 rename nuttx/lib/{ => string}/lib_strcpy.c (95%)
 rename nuttx/lib/{ => string}/lib_strcspn.c (96%)
 rename nuttx/lib/{ => string}/lib_strdup.c (95%)
 rename nuttx/lib/{ => string}/lib_strerror.c (98%)
 rename nuttx/lib/{ => string}/lib_strlen.c (95%)
 rename nuttx/lib/{ => string}/lib_strncasecmp.c (96%)
 rename nuttx/lib/{ => string}/lib_strncat.c (96%)
 rename nuttx/lib/{ => string}/lib_strncmp.c (100%)
 rename nuttx/lib/{ => string}/lib_strncpy.c (96%)
 rename nuttx/lib/{ => string}/lib_strnlen.c (98%)
 rename nuttx/lib/{ => string}/lib_strpbrk.c (96%)
 rename nuttx/lib/{ => string}/lib_strrchr.c (96%)
 rename nuttx/lib/{ => string}/lib_strspn.c (96%)
 rename nuttx/lib/{ => string}/lib_strstr.c (97%)
 rename nuttx/lib/{ => string}/lib_strtod.c (97%)
 rename nuttx/lib/{ => string}/lib_strtok.c (97%)
 rename nuttx/lib/{ => string}/lib_strtokr.c (98%)
 rename nuttx/lib/{ => string}/lib_strtol.c (97%)
 rename nuttx/lib/{ => string}/lib_strtoll.c (97%)
 rename nuttx/lib/{ => string}/lib_strtoul.c (97%)
 rename nuttx/lib/{ => string}/lib_strtoull.c (97%)

diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile
index ce80133b4..7c46280c5 100644
--- a/nuttx/drivers/Makefile
+++ b/nuttx/drivers/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # drivers/Makefile
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-BIN		= libdrivers$(LIBEXT)
+BIN			= libdrivers$(LIBEXT)
 
 VPATH		= serial:net:pipes:usbdev:usbhost:mmcsd:lcd:bch:mtd
 
diff --git a/nuttx/include/string.h b/nuttx/include/string.h
index 4aa5a48dc..7d7dc21d4 100644
--- a/nuttx/include/string.h
+++ b/nuttx/include/string.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/string.h
  *
- *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile
index a3a0c6181..c7cf965a6 100644
--- a/nuttx/lib/Makefile
+++ b/nuttx/lib/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # lib/Makefile
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,19 @@
 ###########################################################################
 
 -include $(TOPDIR)/Make.defs
+include string/Make.defs
 
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
+ASRCS = 
+AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-MISC_SRCS	= lib_init.c lib_filesem.c
+MISC_SRCS = lib_init.c lib_filesem.c
 ifneq ($(CONFIG_NFILE_STREAMS),0)
-MISC_SRCS	+= lib_streamsem.c
+MISC_SRCS += lib_streamsem.c
 endif
 
-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_strnlen.c \
-		  lib_strncasecmp.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 lib_strtod.c
+CTYPE_SRCS = 
 
-CTYPE_SRCS	= 
-
-STDIO_SRCS	= lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
+STDIO_SRCS = lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
 		  lib_sprintf.c lib_snprintf.c lib_libsprintf.c lib_vsprintf.c \
 		  lib_vsnprintf.c lib_libvsprintf.c lib_meminstream.c \
 		  lib_memoutstream.c lib_lowinstream.c lib_lowoutstream.c \
@@ -62,9 +54,9 @@ STDIO_SRCS	= lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
 		  lib_sscanf.c
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-STDIO_SRCS	+= lib_rawinstream.c lib_rawoutstream.c
+STDIO_SRCS += lib_rawinstream.c lib_rawoutstream.c
 ifneq ($(CONFIG_NFILE_STREAMS),0)
-STDIO_SRCS	+= lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
+STDIO_SRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
 		   lib_ftell.c lib_fsetpos.c lib_fgetpos.c lib_fgetc.c lib_fgets.c \
 		   lib_gets.c lib_fwrite.c lib_libfwrite.c lib_fflush.c \
 		   lib_libflushall.c lib_libfflush.c lib_rdflush.c lib_wrflush.c \
@@ -73,50 +65,54 @@ STDIO_SRCS	+= lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
 endif
 endif
 ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
-STDIO_SRCS	+= lib_dtoa.c
+STDIO_SRCS += lib_dtoa.c
 endif
 
-STDLIB_SRCS	= lib_abs.c lib_imaxabs.c lib_labs.c lib_llabs.c lib_rand.c lib_qsort.c
+STDLIB_SRCS = lib_abs.c lib_imaxabs.c lib_labs.c lib_llabs.c lib_rand.c lib_qsort.c
 
-MATH_SRCS	= lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
+MATH_SRCS = lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
 
-UNISTD_SRCS	= lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
+UNISTD_SRCS = lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
 ifneq ($(CONFIG_DISABLE_ENVIRON),y)
-UNISTD_SRCS	+=  lib_chdir.c lib_getcwd.c
+UNISTD_SRCS +=  lib_chdir.c lib_getcwd.c
 endif
 endif
 
-TIME_SRCS	= lib_mktime.c lib_gmtime.c lib_gmtimer.c lib_strftime.c \
+TIME_SRCS = lib_mktime.c lib_gmtime.c lib_gmtimer.c lib_strftime.c \
 		  lib_calendar2utc.c lib_daysbeforemonth.c lib_isleapyear.c
 
-NET_SRCS	= lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c
+NET_SRCS = lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c
 
-LIBGEN_SRCS	= lib_basename.c lib_dirname.c
+LIBGEN_SRCS = lib_basename.c lib_dirname.c
 
-REGEX_SRCS	= lib_match.c
+REGEX_SRCS = lib_match.c
 
-CRC_SRCS	= lib_crc32.c
+CRC_SRCS = lib_crc32.c
 
-SQ_SRCS		= sq_addlast.c sq_addfirst.c sq_addafter.c \
+SQ_SRCS = sq_addlast.c sq_addfirst.c sq_addafter.c \
 		  sq_rem.c sq_remlast.c sq_remfirst.c sq_remafter.c
 
-DQ_SRCS		= dq_addlast.c dq_addfirst.c dq_addafter.c dq_addbefore.c \
+DQ_SRCS = dq_addlast.c dq_addfirst.c dq_addafter.c dq_addbefore.c \
 		  dq_rem.c dq_remlast.c dq_remfirst.c
 
-DBG_SRCS	= lib_dbg.c lib_dumpbuffer.c
+DBG_SRCS = lib_dbg.c lib_dumpbuffer.c
 
-CSRCS		= $(MISC_SRCS) $(STRING_SRCS) $(CTYPE_SRCS) $(STDIO_SRCS) $(STDLIB_SRCS) \
+CSRCS = $(MISC_SRCS) $(STRING_SRCS) $(CTYPE_SRCS) $(STDIO_SRCS) $(STDLIB_SRCS) \
 		  $(MATH_SRCS) $(UNISTD_SRCS) $(TIME_SRCS) $(NET_SRCS) $(LIBGEN_SRCS) \
 		  $(REGEX_SRCS) $(CRC_SRCS) $(SQ_SRCS) $(DQ_SRCS) $(DBG_SRCS) 
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-BIN		= liblib$(LIBEXT)
+ROOTDEPPATH	= --dep-path .
+STRINGDEPPATH = --dep-path string
+VPATH = string
 
-all:	$(BIN)
+BIN = liblib$(LIBEXT)
+
+all: $(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -130,7 +126,8 @@ $(BIN):	$(OBJS)
 	done ; )
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) $(STRINGDEPPATH) \
+	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 
 depend: .depend
diff --git a/nuttx/lib/string/Make.defs b/nuttx/lib/string/Make.defs
new file mode 100644
index 000000000..c8f5b05f3
--- /dev/null
+++ b/nuttx/lib/string/Make.defs
@@ -0,0 +1,43 @@
+############################################################################
+# lib/string/Make.defs
+#
+#   Copyright (C) 2010 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 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.
+#
+############################################################################
+
+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_strnlen.c \
+		  lib_strncasecmp.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 lib_strtod.c
diff --git a/nuttx/lib/lib_checkbase.c b/nuttx/lib/string/lib_checkbase.c
similarity index 97%
rename from nuttx/lib/lib_checkbase.c
rename to nuttx/lib/string/lib_checkbase.c
index ed2654b1f..bec131b5c 100644
--- a/nuttx/lib/lib_checkbase.c
+++ b/nuttx/lib/string/lib_checkbase.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_checkbase.c
+ * lib/string/lib_checkbase.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_isbasedigit.c b/nuttx/lib/string/lib_isbasedigit.c
similarity index 97%
rename from nuttx/lib/lib_isbasedigit.c
rename to nuttx/lib/string/lib_isbasedigit.c
index adc8dfd32..26426e821 100644
--- a/nuttx/lib/lib_isbasedigit.c
+++ b/nuttx/lib/string/lib_isbasedigit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_isbasedigit.c
+ * lib/string/lib_isbasedigit.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_memcmp.c b/nuttx/lib/string/lib_memcmp.c
similarity index 96%
rename from nuttx/lib/lib_memcmp.c
rename to nuttx/lib/string/lib_memcmp.c
index 3dee4f0c7..cd874a85e 100644
--- a/nuttx/lib/lib_memcmp.c
+++ b/nuttx/lib/string/lib_memcmp.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memcmp.c
+ * lib/string/lib_memcmp.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_memcpy.c b/nuttx/lib/string/lib_memcpy.c
similarity index 96%
rename from nuttx/lib/lib_memcpy.c
rename to nuttx/lib/string/lib_memcpy.c
index b9445214d..745bafe98 100644
--- a/nuttx/lib/lib_memcpy.c
+++ b/nuttx/lib/string/lib_memcpy.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memcpy.c
+ * lib/string/lib_memcpy.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_memmove.c b/nuttx/lib/string/lib_memmove.c
similarity index 96%
rename from nuttx/lib/lib_memmove.c
rename to nuttx/lib/string/lib_memmove.c
index 564f9cdbe..97bac99ed 100644
--- a/nuttx/lib/lib_memmove.c
+++ b/nuttx/lib/string/lib_memmove.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memmove.c
+ * lib/string/lib_memmove.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_memset.c b/nuttx/lib/string/lib_memset.c
similarity index 96%
rename from nuttx/lib/lib_memset.c
rename to nuttx/lib/string/lib_memset.c
index 6b197460b..f3a5497a9 100644
--- a/nuttx/lib/lib_memset.c
+++ b/nuttx/lib/string/lib_memset.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_memset.c
+ * lib/string/lib_memset.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_skipspace.c b/nuttx/lib/string/lib_skipspace.c
similarity index 96%
rename from nuttx/lib/lib_skipspace.c
rename to nuttx/lib/string/lib_skipspace.c
index bfd4d14fe..826559efe 100644
--- a/nuttx/lib/lib_skipspace.c
+++ b/nuttx/lib/string/lib_skipspace.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_skipspace.c
+ * lib/string/lib_skipspace.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strcasecmp.c b/nuttx/lib/string/lib_strcasecmp.c
similarity index 95%
rename from nuttx/lib/lib_strcasecmp.c
rename to nuttx/lib/string/lib_strcasecmp.c
index cb4585b5b..ed5217831 100644
--- a/nuttx/lib/lib_strcasecmp.c
+++ b/nuttx/lib/string/lib_strcasecmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strcasecmp.c
+ * lib/string/lib_strcasecmp.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strcat.c b/nuttx/lib/string/lib_strcat.c
similarity index 93%
rename from nuttx/lib/lib_strcat.c
rename to nuttx/lib/string/lib_strcat.c
index e1104f4d4..2d12dd5a6 100644
--- a/nuttx/lib/lib_strcat.c
+++ b/nuttx/lib/string/lib_strcat.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strcat.c
+ * lib/string/lib_strcat.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strchr.c b/nuttx/lib/string/lib_strchr.c
similarity index 96%
rename from nuttx/lib/lib_strchr.c
rename to nuttx/lib/string/lib_strchr.c
index 86a44530b..1086f128d 100644
--- a/nuttx/lib/lib_strchr.c
+++ b/nuttx/lib/string/lib_strchr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strchr.c
+ * lib/string/lib_strchr.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strcmp.c b/nuttx/lib/string/lib_strcmp.c
similarity index 96%
rename from nuttx/lib/lib_strcmp.c
rename to nuttx/lib/string/lib_strcmp.c
index fd384926f..1d78cb049 100644
--- a/nuttx/lib/lib_strcmp.c
+++ b/nuttx/lib/string/lib_strcmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strcmp.c
+ * lib/string/lib_strcmp.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strcpy.c b/nuttx/lib/string/lib_strcpy.c
similarity index 95%
rename from nuttx/lib/lib_strcpy.c
rename to nuttx/lib/string/lib_strcpy.c
index 10ef6918f..774e15534 100644
--- a/nuttx/lib/lib_strcpy.c
+++ b/nuttx/lib/string/lib_strcpy.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strcpy.c
+ * lib/string/lib_strcpy.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strcspn.c b/nuttx/lib/string/lib_strcspn.c
similarity index 96%
rename from nuttx/lib/lib_strcspn.c
rename to nuttx/lib/string/lib_strcspn.c
index 1aa7c8ceb..b28f22343 100644
--- a/nuttx/lib/lib_strcspn.c
+++ b/nuttx/lib/string/lib_strcspn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strcspn.c
+ * lib/string/lib_strcspn.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strdup.c b/nuttx/lib/string/lib_strdup.c
similarity index 95%
rename from nuttx/lib/lib_strdup.c
rename to nuttx/lib/string/lib_strdup.c
index 2bb9dbc9d..04ecaffbe 100644
--- a/nuttx/lib/lib_strdup.c
+++ b/nuttx/lib/string/lib_strdup.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strdup.c
+ * lib/string//lib_strdup.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strerror.c b/nuttx/lib/string/lib_strerror.c
similarity index 98%
rename from nuttx/lib/lib_strerror.c
rename to nuttx/lib/string/lib_strerror.c
index 4a3c891a1..61538952d 100644
--- a/nuttx/lib/lib_strerror.c
+++ b/nuttx/lib/string/lib_strerror.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strerror.c
+ * lib/string/lib_strerror.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strlen.c b/nuttx/lib/string/lib_strlen.c
similarity index 95%
rename from nuttx/lib/lib_strlen.c
rename to nuttx/lib/string/lib_strlen.c
index 9c829c61f..ee964c137 100644
--- a/nuttx/lib/lib_strlen.c
+++ b/nuttx/lib/string/lib_strlen.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strlen.c
+ * lib/string/lib_strlen.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strncasecmp.c b/nuttx/lib/string/lib_strncasecmp.c
similarity index 96%
rename from nuttx/lib/lib_strncasecmp.c
rename to nuttx/lib/string/lib_strncasecmp.c
index fc8bf7b72..78b18a3fb 100644
--- a/nuttx/lib/lib_strncasecmp.c
+++ b/nuttx/lib/string/lib_strncasecmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strncasecmp.c
+ * lib/string/lib_strncasecmp.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strncat.c b/nuttx/lib/string/lib_strncat.c
similarity index 96%
rename from nuttx/lib/lib_strncat.c
rename to nuttx/lib/string/lib_strncat.c
index 6cb91ff41..6b7d54f81 100644
--- a/nuttx/lib/lib_strncat.c
+++ b/nuttx/lib/string/lib_strncat.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib/lib_strncat.c
+ * lib/string/lib_strncat.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strncmp.c b/nuttx/lib/string/lib_strncmp.c
similarity index 100%
rename from nuttx/lib/lib_strncmp.c
rename to nuttx/lib/string/lib_strncmp.c
diff --git a/nuttx/lib/lib_strncpy.c b/nuttx/lib/string/lib_strncpy.c
similarity index 96%
rename from nuttx/lib/lib_strncpy.c
rename to nuttx/lib/string/lib_strncpy.c
index c612cacb1..b5702cae2 100644
--- a/nuttx/lib/lib_strncpy.c
+++ b/nuttx/lib/string/lib_strncpy.c
@@ -1,7 +1,7 @@
 /************************************************************
- * lib_strncpy.c
+ * lib/string/lib_strncpy.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strnlen.c b/nuttx/lib/string/lib_strnlen.c
similarity index 98%
rename from nuttx/lib/lib_strnlen.c
rename to nuttx/lib/string/lib_strnlen.c
index f6624a64f..c2ffc248e 100644
--- a/nuttx/lib/lib_strnlen.c
+++ b/nuttx/lib/string/lib_strnlen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_strnlen.c
+ * lib/string/lib_strnlen.c
  *
  * This file is part of NuttX, contributed by Michael Hrabanek
  *
diff --git a/nuttx/lib/lib_strpbrk.c b/nuttx/lib/string/lib_strpbrk.c
similarity index 96%
rename from nuttx/lib/lib_strpbrk.c
rename to nuttx/lib/string/lib_strpbrk.c
index e429bb079..134058775 100644
--- a/nuttx/lib/lib_strpbrk.c
+++ b/nuttx/lib/string/lib_strpbrk.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strpbrk.pcs
+ * lib/string/lib_strpbrk.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use str source and binary forms, with or without
diff --git a/nuttx/lib/lib_strrchr.c b/nuttx/lib/string/lib_strrchr.c
similarity index 96%
rename from nuttx/lib/lib_strrchr.c
rename to nuttx/lib/string/lib_strrchr.c
index fcec61efe..c80542341 100644
--- a/nuttx/lib/lib_strrchr.c
+++ b/nuttx/lib/string/lib_strrchr.c
@@ -1,7 +1,7 @@
 /************************************************************************
- * lib/lib_strrchr.c
+ * lib/string/lib_strrchr.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strspn.c b/nuttx/lib/string/lib_strspn.c
similarity index 96%
rename from nuttx/lib/lib_strspn.c
rename to nuttx/lib/string/lib_strspn.c
index 2e72cc4c7..e5cab9ad6 100644
--- a/nuttx/lib/lib_strspn.c
+++ b/nuttx/lib/string/lib_strspn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strspn.c
+ * lib/string/lib_strspn.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strstr.c b/nuttx/lib/string/lib_strstr.c
similarity index 97%
rename from nuttx/lib/lib_strstr.c
rename to nuttx/lib/string/lib_strstr.c
index 6db0da642..27ca6e19b 100644
--- a/nuttx/lib/lib_strstr.c
+++ b/nuttx/lib/string/lib_strstr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strstr.c
+ * lib/string/lib_strstr.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use str source and binary forms, with or without
diff --git a/nuttx/lib/lib_strtod.c b/nuttx/lib/string/lib_strtod.c
similarity index 97%
rename from nuttx/lib/lib_strtod.c
rename to nuttx/lib/string/lib_strtod.c
index 777eb6ded..26480f925 100755
--- a/nuttx/lib/lib_strtod.c
+++ b/nuttx/lib/string/lib_strtod.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * lib/lib_strtod.c
- *
+ * lib/string/lib_strtod.c
  * Convert string to double
  *
- * Copyright (C) 2002 Michael Ringgaard. All rights reserved.
- * Copyright (C) 2006-2007 H. Peter Anvin.
+ *   Copyright (C) 2002 Michael Ringgaard. All rights reserved.
+ *   Copyright (C) 2006-2007 H. Peter Anvin.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/lib_strtok.c b/nuttx/lib/string/lib_strtok.c
similarity index 97%
rename from nuttx/lib/lib_strtok.c
rename to nuttx/lib/string/lib_strtok.c
index 5a15eb701..bafa94853 100644
--- a/nuttx/lib/lib_strtok.c
+++ b/nuttx/lib/string/lib_strtok.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strtok.c
+ * lib/string/lib_strtok.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strtokr.c b/nuttx/lib/string/lib_strtokr.c
similarity index 98%
rename from nuttx/lib/lib_strtokr.c
rename to nuttx/lib/string/lib_strtokr.c
index 3183acc00..366a31819 100644
--- a/nuttx/lib/lib_strtokr.c
+++ b/nuttx/lib/string/lib_strtokr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strtokr.c
+ * lib/string/lib_strtokr.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strtol.c b/nuttx/lib/string/lib_strtol.c
similarity index 97%
rename from nuttx/lib/lib_strtol.c
rename to nuttx/lib/string/lib_strtol.c
index b07bd9973..4f6904793 100644
--- a/nuttx/lib/lib_strtol.c
+++ b/nuttx/lib/string/lib_strtol.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strtol.c
+ * lib/string/lib_strtol.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strtoll.c b/nuttx/lib/string/lib_strtoll.c
similarity index 97%
rename from nuttx/lib/lib_strtoll.c
rename to nuttx/lib/string/lib_strtoll.c
index 8ddc6afe2..9c730b431 100644
--- a/nuttx/lib/lib_strtoll.c
+++ b/nuttx/lib/string/lib_strtoll.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_strtoll.c
+ * lib/string/lib_strtoll.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strtoul.c b/nuttx/lib/string/lib_strtoul.c
similarity index 97%
rename from nuttx/lib/lib_strtoul.c
rename to nuttx/lib/string/lib_strtoul.c
index ba88139ad..2aacc7cea 100644
--- a/nuttx/lib/lib_strtoul.c
+++ b/nuttx/lib/string/lib_strtoul.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strtoul.c
+ * /lib/string/lib_strtoul.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/lib/lib_strtoull.c b/nuttx/lib/string/lib_strtoull.c
similarity index 97%
rename from nuttx/lib/lib_strtoull.c
rename to nuttx/lib/string/lib_strtoull.c
index f84bf7e11..334162148 100644
--- a/nuttx/lib/lib_strtoull.c
+++ b/nuttx/lib/string/lib_strtoull.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_strtoull.c
+ * /lib/string/lib_strtoull.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without