libc: Move stream implementation from libs/libc/stdio to libs/libc/stream

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

libs/libc/Makefile

@@ -52,6 +52,7 @@ include signal/Make.defs
 include spawn/Make.defs
 include stdio/Make.defs
 include stdlib/Make.defs
+include stream/Make.defs
 include string/Make.defs
 include symtab/Make.defs
 include syslog/Make.defs

libs/libc/stdio/Make.defs

@@ -25,16 +25,12 @@ CSRCS += lib_fileno.c lib_printf.c lib_sprintf.c lib_asprintf.c
 CSRCS += lib_snprintf.c lib_libsprintf.c lib_vsprintf.c lib_vasprintf.c
 CSRCS += lib_vsnprintf.c lib_dprintf.c lib_vdprintf.c lib_vprintf.c
 CSRCS += lib_perror.c lib_putchar.c lib_getchar.c lib_puts.c
-CSRCS += lib_meminstream.c lib_memoutstream.c lib_memsistream.c
-CSRCS += lib_memsostream.c lib_lowoutstream.c lib_rawinstream.c
-CSRCS += lib_rawoutstream.c lib_rawsistream.c lib_rawsostream.c
-CSRCS += lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c
-CSRCS += lib_sscanf.c lib_vsscanf.c lib_libvscanf.c lib_libnoflush.c
-CSRCS += lib_libsnoflush.c lib_libvsprintf.c lib_ultoa_invert.c
+CSRCS += lib_sscanf.c lib_vsscanf.c lib_libvscanf.c lib_libvsprintf.c
+CSRCS += lib_remove.c lib_tempnam.c lib_tmpnam.c lib_ultoa_invert.c
+
 ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
 CSRCS += lib_dtoa_engine.c lib_dtoa_data.c
 endif
-CSRCS += lib_remove.c lib_tempnam.c lib_tmpnam.c
 
 # The remaining sources files depend upon C streams
 
@@ -45,9 +41,8 @@ CSRCS += lib_getdelim.c lib_fgetpos.c lib_getc.c lib_fgetc.c
 CSRCS += lib_fgets.c lib_gets_s.c lib_gets.c lib_libfgets.c lib_fwrite.c
 CSRCS += lib_libfwrite.c lib_fflush.c lib_libflushall.c lib_libfflush.c
 CSRCS += lib_rdflush.c lib_wrflush.c lib_putc.c lib_fputc.c
-CSRCS += lib_fputs.c lib_ungetc.c lib_fprintf.c
-CSRCS += lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c lib_stdsistream.c
-CSRCS += lib_stdsostream.c lib_feof.c lib_ferror.c lib_rewind.c lib_clearerr.c
+CSRCS += lib_fputs.c lib_ungetc.c lib_fprintf.c lib_vfprintf.c
+CSRCS += lib_feof.c lib_ferror.c lib_rewind.c lib_clearerr.c
 CSRCS += lib_scanf.c lib_vscanf.c lib_fscanf.c lib_vfscanf.c lib_tmpfile.c
 CSRCS += lib_setbuf.c lib_setvbuf.c lib_libstream.c lib_libfilesem.c
 endif

libs/libc/stream/Make.defs

@@ -0,0 +1,40 @@
+############################################################################
+# libs/libc/stream/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+# Add the stdio C files to the build
+# This first group of C files do not depend on having C streams.
+
+CSRCS += lib_meminstream.c lib_memoutstream.c lib_memsistream.c
+CSRCS += lib_memsostream.c lib_lowoutstream.c lib_rawinstream.c
+CSRCS += lib_rawoutstream.c lib_rawsistream.c lib_rawsostream.c
+CSRCS += lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c
+CSRCS += lib_libnoflush.c lib_libsnoflush.c
+
+# The remaining sources files depend upon C streams
+
+ifeq ($(CONFIG_FILE_STREAM),y)
+CSRCS += lib_stdinstream.c lib_stdoutstream.c lib_stdsistream.c
+CSRCS += lib_stdsostream.c
+endif
+
+# Add the stdio directory to the build
+
+DEPPATH += --dep-path stream
+VPATH += :stream

libs/libc/stream/lib_libnoflush.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_libnoflush.c
+ * libs/libc/stream/lib_libnoflush.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_libsnoflush.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_libsnoflush.c
+ * libs/libc/stream/lib_libsnoflush.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_lowoutstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_lowoutstream.c
+ * libs/libc/stream/lib_lowoutstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_meminstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_meminstream.c
+ * libs/libc/stream/lib_meminstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_memoutstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_memoutstream.c
+ * libs/libc/stream/lib_memoutstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_memsistream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_memsistream.c
+ * libs/libc/stream/lib_memsistream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_memsostream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_memsostream.c
+ * libs/libc/stream/lib_memsostream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_nullinstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_nullinstream.c
+ * libs/libc/stream/lib_nullinstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_nulloutstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_nulloutstream.c
+ * libs/libc/stream/lib_nulloutstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_rawinstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_rawinstream.c
+ * libs/libc/stream/lib_rawinstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_rawoutstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_rawoutstream.c
+ * libs/libc/stream/lib_rawoutstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_rawsistream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_rawsistream.c
+ * libs/libc/stream/lib_rawsistream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_rawsostream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_rawsostream.c
+ * libs/libc/stream/lib_rawsostream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_stdinstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_stdinstream.c
+ * libs/libc/stream/lib_stdinstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_stdoutstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_stdoutstream.c
+ * libs/libc/stream/lib_stdoutstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_stdsistream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_stdsistream.c
+ * libs/libc/stream/lib_stdsistream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

libs/libc/stream/lib_stdsostream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_stdsostream.c
+ * libs/libc/stream/lib_stdsostream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -143,5 +143,5 @@ void lib_stdsostream(FAR struct lib_stdsostream_s *outstream,
   /* Set the number of bytes put to zero and remember the stream */
 
   outstream->public.nput = 0;
-  outstream->stream     = stream;
+  outstream->stream      = stream;
 }

libs/libc/stream/lib_zeroinstream.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/lib_zeroinstream.c
+ * libs/libc/stream/lib_zeroinstream.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with