Move stdio.h functions in lib/ to lib/stdio

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

51 files changed, 157 insertions, 121 deletions

diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile
index c7cf965a6..b72415b6e 100644
--- a/nuttx/lib/Makefile
+++ b/nuttx/lib/Makefile
@@ -34,6 +34,7 @@
 ###########################################################################
 
 -include $(TOPDIR)/Make.defs
+include stdio/Make.defs
 include string/Make.defs
 
 ASRCS = 
@@ -46,28 +47,6 @@ endif
 
 CTYPE_SRCS = 
 
-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 \
-		  lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c \
-		  lib_sscanf.c
-
-ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-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 \
-		   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 \
-		   lib_fputc.c lib_puts.c lib_fputs.c lib_ungetc.c lib_vprintf.c \
-		   lib_fprintf.c lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c
-endif
-endif
-ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
-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
 
 MATH_SRCS = lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
@@ -107,8 +86,9 @@ SRCS = $(ASRCS) $(CSRCS)
 OBJS = $(AOBJS) $(COBJS)
 
 ROOTDEPPATH	= --dep-path .
+STDIODEPPATH = --dep-path stdio
 STRINGDEPPATH = --dep-path string
-VPATH = string
+VPATH = stdio:string
 
 BIN = liblib$(LIBEXT)
 
@@ -126,7 +106,7 @@ $(BIN):	$(OBJS)
 	done ; )
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(STRINGDEPPATH) \
+	@$(MKDEP) $(ROOTDEPPATH) $(STRINGDEPPATH) $(STDIODEPPATH) \
 	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 
diff --git a/nuttx/lib/stdio/Make.defs b/nuttx/lib/stdio/Make.defs
new file mode 100644
index 000000000..9478369f3
--- /dev/null
+++ b/nuttx/lib/stdio/Make.defs
@@ -0,0 +1,56 @@
+############################################################################
+# lib/stdio/Make.defs
+#
+#   Copyright (C) 2011 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.
+#
+############################################################################
+
+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 \
+		  lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c \
+		  lib_sscanf.c
+
+ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
+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 \
+		   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 \
+		   lib_fputc.c lib_puts.c lib_fputs.c lib_ungetc.c lib_vprintf.c \
+		   lib_fprintf.c lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c
+endif
+endif
+ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
+STDIO_SRCS += lib_dtoa.c
+endif
diff --git a/nuttx/lib/lib_dtoa.c b/nuttx/lib/stdio/lib_dtoa.c
index 08904d9df..942ed2033 100755
--- a/nuttx/lib/lib_dtoa.c
+++ b/nuttx/lib/stdio/lib_dtoa.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_dtoa.c
+ * lib/stdio/lib_dtoa.c
  *
  * This file was ported to NuttX by Yolande Cates.
  *
diff --git a/nuttx/lib/lib_fclose.c b/nuttx/lib/stdio/lib_fclose.c
index 218b38080..4a9ded90b 100644
--- a/nuttx/lib/lib_fclose.c
+++ b/nuttx/lib/stdio/lib_fclose.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fclose.c
+ * lib/stdio/lib_fclose.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_fflush.c b/nuttx/lib/stdio/lib_fflush.c
index 0e46edce3..c77ab686a 100644
--- a/nuttx/lib/lib_fflush.c
+++ b/nuttx/lib/stdio/lib_fflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fflush.c
+ * lib/stdio/lib_fflush.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_fgetc.c b/nuttx/lib/stdio/lib_fgetc.c
index 01801b850..58a199724 100644
--- a/nuttx/lib/lib_fgetc.c
+++ b/nuttx/lib/stdio/lib_fgetc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fgetc.c
+ * lib/stdio/lib_fgetc.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_fgetpos.c b/nuttx/lib/stdio/lib_fgetpos.c
index e91476813..a641db481 100644
--- a/nuttx/lib/lib_fgetpos.c
+++ b/nuttx/lib/stdio/lib_fgetpos.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fgetpos.c
+ * lib/stdio/lib_fgetpos.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_fgets.c b/nuttx/lib/stdio/lib_fgets.c
index 67d553c57..3f72f0000 100644
--- a/nuttx/lib/lib_fgets.c
+++ b/nuttx/lib/stdio/lib_fgets.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fgets.c
+ * lib/stdio/lib_fgets.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_fileno.c b/nuttx/lib/stdio/lib_fileno.c
index 1f33cd8f4..2fe3d9c99 100644
--- a/nuttx/lib/lib_fileno.c
+++ b/nuttx/lib/stdio/lib_fileno.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fileno.c
+ * lib/stdio/lib_fileno.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_fopen.c b/nuttx/lib/stdio/lib_fopen.c
index e198ce888..07437161c 100644
--- a/nuttx/lib/lib_fopen.c
+++ b/nuttx/lib/stdio/lib_fopen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_fopen.c
+ * lib/stdio/lib_fopen.c
  *
  *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/nuttx/lib/lib_fprintf.c b/nuttx/lib/stdio/lib_fprintf.c
index 72d3c9acc..4ebb3d7d2 100644
--- a/nuttx/lib/lib_fprintf.c
+++ b/nuttx/lib/stdio/lib_fprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fprintf.c
+ * lib/stdio/lib_fprintf.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_fputc.c b/nuttx/lib/stdio/lib_fputc.c
index 56ac536c2..f5eeecea7 100644
--- a/nuttx/lib/lib_fputc.c
+++ b/nuttx/lib/stdio/lib_fputc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fputc.c
+ * lib/stdio/lib_fputc.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_fputs.c b/nuttx/lib/stdio/lib_fputs.c
index 8c4e6d772..870c5c42e 100644
--- a/nuttx/lib/lib_fputs.c
+++ b/nuttx/lib/stdio/lib_fputs.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fputs.c
+ * lib/stdio/lib_fputs.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_fread.c b/nuttx/lib/stdio/lib_fread.c
index 3345e55b1..cc652fab7 100644
--- a/nuttx/lib/lib_fread.c
+++ b/nuttx/lib/stdio/lib_fread.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fread.c
+ * lib/stdio/lib_fread.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_fseek.c b/nuttx/lib/stdio/lib_fseek.c
index 379e5c322..e56645ab6 100644
--- a/nuttx/lib/lib_fseek.c
+++ b/nuttx/lib/stdio/lib_fseek.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fseek.c
+ * lib/stdio/lib_fseek.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_fsetpos.c b/nuttx/lib/stdio/lib_fsetpos.c
index eca0c2d67..637c627b5 100644
--- a/nuttx/lib/lib_fsetpos.c
+++ b/nuttx/lib/stdio/lib_fsetpos.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fsetpos.c
+ * lib/stdio/lib_fsetpos.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 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_ftell.c b/nuttx/lib/stdio/lib_ftell.c
index 3b3bee775..b0b0a78e5 100644
--- a/nuttx/lib/lib_ftell.c
+++ b/nuttx/lib/stdio/lib_ftell.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_ftell.c
+ * lib/stdio/lib_ftell.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 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_fwrite.c b/nuttx/lib/stdio/lib_fwrite.c
index 2ec35cd60..1b7be2ce5 100644
--- a/nuttx/lib/lib_fwrite.c
+++ b/nuttx/lib/stdio/lib_fwrite.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fwrite.c
+ * lib/stdio/lib_fwrite.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_gets.c b/nuttx/lib/stdio/lib_gets.c
index e8b7f717e..33ae48aaa 100644
--- a/nuttx/lib/lib_gets.c
+++ b/nuttx/lib/stdio/lib_gets.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_gets.c
+ * lib/stdio/lib_gets.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_libfflush.c b/nuttx/lib/stdio/lib_libfflush.c
index 3604d00b9..68a1bc39f 100644
--- a/nuttx/lib/lib_libfflush.c
+++ b/nuttx/lib/stdio/lib_libfflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libfflush.c
+ * lib/stdio/lib_libfflush.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_libflushall.c b/nuttx/lib/stdio/lib_libflushall.c
index 49ee41e66..de2853df8 100644
--- a/nuttx/lib/lib_libflushall.c
+++ b/nuttx/lib/stdio/lib_libflushall.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libflushall.c
+ * lib/stdio/lib_libflushall.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_libfread.c b/nuttx/lib/stdio/lib_libfread.c
index 52f80fee8..abeb34deb 100644
--- a/nuttx/lib/lib_libfread.c
+++ b/nuttx/lib/stdio/lib_libfread.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libfread.c
+ * lib/stdio/lib_libfread.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_libfwrite.c b/nuttx/lib/stdio/lib_libfwrite.c
index 616e8a624..3b7253cdd 100644
--- a/nuttx/lib/lib_libfwrite.c
+++ b/nuttx/lib/stdio/lib_libfwrite.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libfwrite.c
+ * lib/stdio/lib_libfwrite.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_libsprintf.c b/nuttx/lib/stdio/lib_libsprintf.c
index 1f297fe45..04d547754 100644
--- a/nuttx/lib/lib_libsprintf.c
+++ b/nuttx/lib/stdio/lib_libsprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libsprintf.c
+ * lib/stdio/lib_libsprintf.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_libvsprintf.c b/nuttx/lib/stdio/lib_libvsprintf.c
index 7ad2184eb..b3b9e41e6 100644
--- a/nuttx/lib/lib_libvsprintf.c
+++ b/nuttx/lib/stdio/lib_libvsprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libvsprintf.c
+ * lib/stdio/lib_libvsprintf.c
  *
- *   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
@@ -1108,7 +1108,7 @@ static void postjustify(FAR struct lib_outstream_s *obj, uint8_t fmt,
  ****************************************************************************/
 
 /****************************************************************************
- * lib_vsprintf
+ * lib/stdio/lib_vsprintf
  ****************************************************************************/
 
 int lib_vsprintf(FAR struct lib_outstream_s *obj, const char *src, va_list ap)
diff --git a/nuttx/lib/lib_lowinstream.c b/nuttx/lib/stdio/lib_lowinstream.c
index c5016bebe..85f916acb 100644
--- a/nuttx/lib/lib_lowinstream.c
+++ b/nuttx/lib/stdio/lib_lowinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_lowinstream.c
+ * lib/stdio/lib_lowinstream.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_lowoutstream.c b/nuttx/lib/stdio/lib_lowoutstream.c
index 0bbf6450f..2ab7c9f67 100644
--- a/nuttx/lib/lib_lowoutstream.c
+++ b/nuttx/lib/stdio/lib_lowoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_lowoutstream.c
+ * lib/stdio/lib_lowoutstream.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_lowprintf.c b/nuttx/lib/stdio/lib_lowprintf.c
index 1b071331f..576402d61 100644
--- a/nuttx/lib/lib_lowprintf.c
+++ b/nuttx/lib/stdio/lib_lowprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_lowprintf.c
+ * lib/stdio/lib_lowprintf.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_meminstream.c b/nuttx/lib/stdio/lib_meminstream.c
index 62260c639..6e1db7c2c 100644
--- a/nuttx/lib/lib_meminstream.c
+++ b/nuttx/lib/stdio/lib_meminstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_meminstream.c
+ * lib/stdio/lib_meminstream.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_memoutstream.c b/nuttx/lib/stdio/lib_memoutstream.c
index 0395e22a9..1cf2a8f29 100644
--- a/nuttx/lib/lib_memoutstream.c
+++ b/nuttx/lib/stdio/lib_memoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_memoutstream.c
+ * lib/stdio/lib_memoutstream.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_nullinstream.c b/nuttx/lib/stdio/lib_nullinstream.c
index cd24bc1f6..271cba396 100644
--- a/nuttx/lib/lib_nullinstream.c
+++ b/nuttx/lib/stdio/lib_nullinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_nullinstream.c
+ * lib/stdio/lib_nullinstream.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_nulloutstream.c b/nuttx/lib/stdio/lib_nulloutstream.c
index c3dcfe0f6..85b7daa9e 100644
--- a/nuttx/lib/lib_nulloutstream.c
+++ b/nuttx/lib/stdio/lib_nulloutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_nulloutstream.c
+ * lib/stdio/lib_nulloutstream.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_printf.c b/nuttx/lib/stdio/lib_printf.c
index f2e0c8f7b..d24355f40 100644
--- a/nuttx/lib/lib_printf.c
+++ b/nuttx/lib/stdio/lib_printf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_printf.c
+ * lib/stdio/lib_printf.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_puts.c b/nuttx/lib/stdio/lib_puts.c
index 129c7b807..5e651c4de 100644
--- a/nuttx/lib/lib_puts.c
+++ b/nuttx/lib/stdio/lib_puts.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_puts.c
+ * lib/stdio/lib_puts.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_rawinstream.c b/nuttx/lib/stdio/lib_rawinstream.c
index de7301a58..b54305ce6 100644
--- a/nuttx/lib/lib_rawinstream.c
+++ b/nuttx/lib/stdio/lib_rawinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rawinstream.c
+ * lib/stdio/lib_rawinstream.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_rawoutstream.c b/nuttx/lib/stdio/lib_rawoutstream.c
index 4d102446b..bf9a68206 100644
--- a/nuttx/lib/lib_rawoutstream.c
+++ b/nuttx/lib/stdio/lib_rawoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rawoutstream.c
+ * lib/stdio/lib_rawoutstream.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_rawprintf.c b/nuttx/lib/stdio/lib_rawprintf.c
index 9999b8ecc..915fd833b 100644
--- a/nuttx/lib/lib_rawprintf.c
+++ b/nuttx/lib/stdio/lib_rawprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rawprintf.c
+ * lib/stdio/lib_rawprintf.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_rdflush.c b/nuttx/lib/stdio/lib_rdflush.c
index 451dccfdc..592cc4183 100644
--- a/nuttx/lib/lib_rdflush.c
+++ b/nuttx/lib/stdio/lib_rdflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rdflush.c
+ * lib/stdio/lib_rdflush.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 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_snprintf.c b/nuttx/lib/stdio/lib_snprintf.c
index 4c3b01e30..a4dcd399b 100644
--- a/nuttx/lib/lib_snprintf.c
+++ b/nuttx/lib/stdio/lib_snprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_snprintf.c
+ * lib/stdio/lib_snprintf.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_sprintf.c b/nuttx/lib/stdio/lib_sprintf.c
index f5efe3235..6de019cc5 100644
--- a/nuttx/lib/lib_sprintf.c
+++ b/nuttx/lib/stdio/lib_sprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_sprintf.c
+ * lib/stdio/lib_sprintf.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_sscanf.c b/nuttx/lib/stdio/lib_sscanf.c
index c6110bdb0..9f2a411a4 100644
--- a/nuttx/lib/lib_sscanf.c
+++ b/nuttx/lib/stdio/lib_sscanf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_sscanf.c
+ * lib/stdio/lib_sscanf.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_stdinstream.c b/nuttx/lib/stdio/lib_stdinstream.c
index 4f99e4439..d89b6b63a 100644
--- a/nuttx/lib/lib_stdinstream.c
+++ b/nuttx/lib/stdio/lib_stdinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_stdinstream.c
+ * lib/stdio/lib_stdinstream.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_stdoutstream.c b/nuttx/lib/stdio/lib_stdoutstream.c
index d92236edb..272a93309 100644
--- a/nuttx/lib/lib_stdoutstream.c
+++ b/nuttx/lib/stdio/lib_stdoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_stdoutstream.c
+ * lib/stdio/lib_stdoutstream.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_ungetc.c b/nuttx/lib/stdio/lib_ungetc.c
index b3ec910c0..9ad72b394 100644
--- a/nuttx/lib/lib_ungetc.c
+++ b/nuttx/lib/stdio/lib_ungetc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_ungetc.c
+ * lib/stdio/lib_ungetc.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_vfprintf.c b/nuttx/lib/stdio/lib_vfprintf.c
index 5e17526a1..25c3954c0 100644
--- a/nuttx/lib/lib_vfprintf.c
+++ b/nuttx/lib/stdio/lib_vfprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vfprintf.c
+ * lib/stdio/lib_vfprintf.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_vprintf.c b/nuttx/lib/stdio/lib_vprintf.c
index 65498250d..a2e31fa05 100644
--- a/nuttx/lib/lib_vprintf.c
+++ b/nuttx/lib/stdio/lib_vprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vprintf.c
+ * lib/stdio/lib_vprintf.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_vsnprintf.c b/nuttx/lib/stdio/lib_vsnprintf.c
index 6391701c8..da885977c 100644
--- a/nuttx/lib/lib_vsnprintf.c
+++ b/nuttx/lib/stdio/lib_vsnprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vsnprintf.c
+ * lib/stdio/lib_vsnprintf.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_vsprintf.c b/nuttx/lib/stdio/lib_vsprintf.c
index a22de0d65..72a829a79 100644
--- a/nuttx/lib/lib_vsprintf.c
+++ b/nuttx/lib/stdio/lib_vsprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vsprintf.c
+ * lib/stdio/lib_vsprintf.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
@@ -84,7 +84,7 @@ int vsprintf(FAR char *dest, const char *src, va_list ap)
   struct lib_memoutstream_s memoutstream;
 
   /* Wrap the destination buffer in a stream object and let
-   * lib_vsprintf do the work.
+   * lib/stdio/lib_vsprintf do the work.
    */
 
   lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, dest, LIB_BUFLEN_UNKNOWN);
diff --git a/nuttx/lib/lib_wrflush.c b/nuttx/lib/stdio/lib_wrflush.c
index 0714c4d3c..c16109515 100644
--- a/nuttx/lib/lib_wrflush.c
+++ b/nuttx/lib/stdio/lib_wrflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_wrflush.c
+ * lib/stdio/lib_wrflush.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_zeroinstream.c b/nuttx/lib/stdio/lib_zeroinstream.c
index 8cf55f51d..27655b547 100644
--- a/nuttx/lib/lib_zeroinstream.c
+++ b/nuttx/lib/stdio/lib_zeroinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_zeroinstream.c
+ * lib/stdio/lib_zeroinstream.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/string/Make.defs b/nuttx/lib/string/Make.defs
index c8f5b05f3..ad9340a82 100644
--- a/nuttx/lib/string/Make.defs
+++ b/nuttx/lib/string/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # lib/string/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without