[libc][posix/io/stdio] rename libc.c as posix/stdio.c

bsp/allwinner/libraries/libos/include/misc/support.h

@@ -21,8 +21,6 @@
 #define __SUPPORT_H__
 #include <typedef.h>
 #include <kapi.h>
-#include <libc.h>
-
 /*
  * Generic macro to convert pointers to values for comparison purposes.
  */

bsp/allwinner/libraries/sunxi-hal/hal/source/usb/include/usb_list.h

@@ -25,7 +25,6 @@
 #ifndef _USB_LIST_H_
 #define _USB_LIST_H_
 
-#include <libc.h>
 #include <log.h>
 #include <hal_osal.h>
 //#include "usb_host_config.h"

components/dfs/dfs_v1/src/dfs.c

@@ -19,7 +19,7 @@
 #endif
 
 #ifdef RT_USING_POSIX_STDIO
-#include <libc.h>
+#include <posix/stdio.h>
 #endif /* RT_USING_POSIX_STDIO */
 
 /* Global variables */

components/libc/compilers/armlibc/syscalls.c

@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <compiler_private.h>
 #ifdef RT_USING_POSIX_STDIO
-    #include "libc.h"
+#include <posix/stdio.h>
 #endif /* RT_USING_POSIX_STDIO */
 
 #define DBG_TAG    "armlibc.syscalls"
@@ -153,7 +153,7 @@ int _sys_read(FILEHANDLE fh, unsigned char *buf, unsigned len, int mode)
     if (fh == STDIN)
     {
 #ifdef RT_USING_POSIX_STDIO
-        if (libc_stdio_get_console() < 0)
+        if (rt_posix_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard output before initializing Compiler");
             return 0; /* error, but keep going */
@@ -375,7 +375,7 @@ int fgetc(FILE *f)
 #ifdef RT_USING_POSIX_STDIO
     char ch;
 
-    if (libc_stdio_get_console() < 0)
+    if (rt_posix_stdio_get_console() < 0)
     {
         LOG_W("Do not invoke standard output before initializing Compiler");
         return 0;

components/libc/compilers/common/cunistd.c

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2022, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2023-08-16     Meco Man     first version
+ */
+
+#include <rtthread.h>
+#include <unistd.h>
+#include <sys/errno.h>
+
+int isatty(int fd)
+{
+#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
+    if(fd == STDOUT_FILENO || fd == STDERR_FILENO)
+    {
+        return 1;
+    }
+#endif /* defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE) */
+
+#ifdef RT_USING_POSIX_STDIO
+    if(fd == STDIN_FILENO)
+    {
+        return 1;
+    }
+#endif /* RT_USING_POSIX_STDIO */
+
+    rt_set_errno(ENOTTY);
+    return 0;
+}
+RTM_EXPORT(isatty);

components/libc/compilers/dlib/syscall_read.c

@@ -12,7 +12,7 @@
 #include <LowLevelIOInterface.h>
 #include <unistd.h>
 #ifdef RT_USING_POSIX_STDIO
-#include "libc.h"
+#include <posix/stdio.h>
 #endif /* RT_USING_POSIX_STDIO */
 #include <compiler_private.h>
 #define DBG_TAG    "dlib.syscall.read"
@@ -40,7 +40,7 @@ size_t __read(int handle, unsigned char *buf, size_t len)
     if (handle == _LLIO_STDIN)
     {
 #ifdef RT_USING_POSIX_STDIO
-        if (libc_stdio_get_console() < 0)
+        if (rt_posix_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard input before initializing Compiler");
             return 0; /* error, but keep going */

components/libc/compilers/newlib/syscalls.c

@@ -21,7 +21,7 @@
 #include <sys/errno.h>
 #include <sys/stat.h>
 #ifdef RT_USING_POSIX_STDIO
-#include "libc.h"
+#include <posix/stdio.h>
 #endif /* RT_USING_POSIX_STDIO */
 #ifdef RT_USING_MODULE
 #include <dlmodule.h>
@@ -225,7 +225,7 @@ _ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
     if (fd == STDIN_FILENO)
     {
 #ifdef RT_USING_POSIX_STDIO
-        if (libc_stdio_get_console() < 0)
+        if (rt_posix_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard input before initializing Compiler");
             return 0;

components/libc/posix/io/stdio/SConscript

@@ -1,22 +1,6 @@
-# RT-Thread building script for component
-
-import os
 from building import *
 
-src     = []
-cwd     = GetCurrentDir()
-CPPPATH = [cwd]
-group   = []
-
-if GetDepend('RT_USING_POSIX_STDIO'):
-    src += ['libc.c']
-
-group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH)
-
-list = os.listdir(cwd)
-for d in list:
-    path = os.path.join(cwd, d)
-    if os.path.isfile(os.path.join(path, 'SConscript')):
-        group = group + SConscript(os.path.join(d, 'SConscript'))
+src     = ['stdio.c']
+group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_STDIO'], CPPPATH = [GetCurrentDir()])
 
 Return('group')

components/libc/compilers/common/include/posix/stdio.h → components/libc/posix/io/stdio/posix/stdio.h

@@ -1,27 +1,29 @@
 /*
- * Copyright (c) 2006-2022, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
- * 2022-06-07     Meco Man     first version
+ * 2017/10/15     bernard      the first version
  */
 
 #ifndef __POSIX_STDIO_H__
 #define __POSIX_STDIO_H__
 
+#include <rtconfig.h>
+#include <stdio.h>
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef DFS_USING_POSIX
+int rt_posix_stdio_init(void);
+int rt_posix_stdio_get_console(void);
+int rt_posix_stdio_set_console(const char* device_name, int mode);
 ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
 ssize_t getline(char **lineptr, size_t *n, FILE *stream);
-#endif /* DFS_USING_POSIX */
 
 #ifdef __cplusplus
 }