[posix][libc] 优化libc中posix结构

components/libc/compilers/gcc/newlib/libc.c

@@ -12,34 +12,23 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/time.h>
-
 #include "libc.h"
 
 #ifdef RT_USING_PTHREADS
 #include <pthread.h>
 #endif
 
-int _EXFUN(putenv,(char *__string));
-
 int libc_system_init(void)
 {
-#if defined(RT_USING_DFS) & defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE)
+#ifdef RT_LIBC_USING_FILEIO
     rt_device_t dev_console;
 
     dev_console = rt_console_get_device();
     if (dev_console)
     {
-    #if defined(RT_USING_POSIX)
         libc_stdio_set_console(dev_console->parent.name, O_RDWR);
-    #else
-        libc_stdio_set_console(dev_console->parent.name, O_WRONLY);
-    #endif
     }
-
-    /* set PATH and HOME */
-    putenv("PATH=/bin");
-    putenv("HOME=/home");
-#endif
+#endif /* RT_LIBC_USING_FILEIO */
 
 #if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT
     pthread_system_init();

components/libc/compilers/gcc/newlib/libc.h

@@ -10,16 +10,15 @@
 #ifndef __RTT_LIBC_H__
 #define __RTT_LIBC_H__
 
-#ifndef _EXFUN
-#define _EXFUN(name, proto)     name proto
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 int libc_system_init(void);
+#ifdef RT_LIBC_USING_FILEIO
 int libc_stdio_get_console(void);
 int libc_stdio_set_console(const char* device_name, int mode);
+#endif /* RT_LIBC_USING_FILEIO */
 
 #ifdef __cplusplus
 }

components/libc/compilers/gcc/newlib/stdio.c

@@ -7,16 +7,16 @@
  * Date           Author       Notes
  * 2017/10/15     bernard      the first version
  */
+#include <rtthread.h>
+
+#ifdef RT_LIBC_USING_FILEIO
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <rtthread.h>
 #include "libc.h"
 
 #define STDIO_DEVICE_NAME_MAX   32
 
-int _EXFUN(fileno, (FILE *));
-
 static FILE* std_console = NULL;
 
 int libc_stdio_set_console(const char* device_name, int mode)
@@ -79,3 +79,5 @@ int libc_stdio_get_console(void)
     else
         return -1;
 }
+
+#endif /* RT_LIBC_USING_FILEIO */

components/libc/compilers/gcc/newlib/syscalls.c

@@ -13,9 +13,16 @@
 
 #include <reent.h>
 #include <rtthread.h>
+#include <stdio.h>
 #include <stddef.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <sys/errno.h>
+#include <sys/stat.h>
+#include "libc.h"
+#ifdef RT_USING_MODULE
+#include <dlmodule.h>
+#endif
 
 #define DBG_TAG    "newlib.syscalls"
 #define DBG_LVL    DBG_INFO
@@ -83,18 +90,8 @@ void __libc_init_array(void)
 }
 
 #ifdef RT_USING_LIBC
-#include <reent.h>
-#include <stdio.h>
-#include "libc.h"
-#ifdef RT_USING_DFS
-#include <dfs_posix.h>
-#endif
-#ifdef RT_USING_MODULE
-#include <dlmodule.h>
-#endif
 
 /* Reentrant versions of system calls.  */
-
 #ifndef _REENT_ONLY
 int *__errno ()
 {
@@ -109,39 +106,29 @@ int _getpid_r(struct _reent *ptr)
 
 int _close_r(struct _reent *ptr, int fd)
 {
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
     return close(fd);
-#endif
 }
 
 int _execve_r(struct _reent *ptr, const char * name, char *const *argv, char *const *env)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
 int _fcntl_r(struct _reent *ptr, int fd, int cmd, int arg)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
 int _fork_r(struct _reent *ptr)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
 int _fstat_r(struct _reent *ptr, int fd, struct stat *pstat)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
@@ -160,162 +147,22 @@ int _isatty_r(struct _reent *ptr, int fd)
 
 int _kill_r(struct _reent *ptr, int pid, int sig)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
 int _link_r(struct _reent *ptr, const char *old, const char *new)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
-_off_t _lseek_r(struct _reent *ptr, int fd, _off_t pos, int whence)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    _off_t rc;
-
-    rc = lseek(fd, pos, whence);
-    return rc;
-#endif
-}
-
-int _mkdir_r(struct _reent *ptr, const char *name, int mode)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    int rc;
-
-    rc = mkdir(name, mode);
-    return rc;
-#endif
-}
-
-int _open_r(struct _reent *ptr, const char *file, int flags, int mode)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    int rc;
-
-    rc = open(file, flags, mode);
-    return rc;
-#endif
-}
-
-_ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    _ssize_t rc;
-    if (libc_stdio_get_console() < 0 && fd == STDIN_FILENO)
-    {
-        LOG_W("Do not invoke standard input before initializing libc");
-        return 0;
-    }
-    rc = read(fd, buf, nbytes);
-    return rc;
-#endif
-}
-
-int _rename_r(struct _reent *ptr, const char *old, const char *new)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    int rc;
-
-    rc = rename(old, new);
-    return rc;
-#endif
-}
-
-int _stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    int rc;
-
-    rc = stat(file, pstat);
-    return rc;
-#endif
-}
-
-int _unlink_r(struct _reent *ptr, const char *file)
-{
-#ifndef RT_USING_DFS
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#else
-    return unlink(file);
-#endif
-}
-
 int _wait_r(struct _reent *ptr, int *status)
 {
-    /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
-_ssize_t _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
-{
-#ifndef RT_USING_DFS
-#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
-    if (STDOUT_FILENO == fd)
-    {
-        rt_device_t console;
-
-        console = rt_console_get_device();
-        if (console) return rt_device_write(console, -1, buf, nbytes);
-    }
-
-    return 0;
-#else
-    /* return "not supported" */
-    ptr->_errno = ENOTSUP;
-    return -1;
-#endif /*RT_USING_DEVICE*/
-#else
-    _ssize_t rc;
-    if (libc_stdio_get_console() < 0 && fd == STDOUT_FILENO)
-    {
-        LOG_W("Do not invoke standard output before initializing libc");
-        return 0;
-    }
-    rc = write(fd, buf, nbytes);
-    return rc;
-#endif
-}
-
-/* for exit() and abort() */
-__attribute__ ((noreturn)) void _exit (int status)
-{
-    extern void __rt_libc_exit(int status);
-    __rt_libc_exit(status);
-    while(1);
-}
-
 mode_t umask(mode_t mask)
 {
     return 022;
@@ -326,6 +173,131 @@ int flock(int fd, int operation)
     return 0;
 }
 
+_off_t _lseek_r(struct _reent *ptr, int fd, _off_t pos, int whence)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    _off_t rc;
+
+    rc = lseek(fd, pos, whence);
+    return rc;
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+int _mkdir_r(struct _reent *ptr, const char *name, int mode)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    int rc;
+
+    rc = mkdir(name, mode);
+    return rc;
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+int _open_r(struct _reent *ptr, const char *file, int flags, int mode)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    int rc;
+
+    rc = open(file, flags, mode);
+    return rc;
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+_ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    _ssize_t rc;
+    if (libc_stdio_get_console() < 0 && fd == STDIN_FILENO)
+    {
+        LOG_W("Do not invoke standard input before initializing libc");
+        return 0;
+    }
+    rc = read(fd, buf, nbytes);
+    return rc;
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+int _rename_r(struct _reent *ptr, const char *old, const char *new)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    int rc;
+
+    rc = rename(old, new);
+    return rc;
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+int _stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    int rc;
+
+    rc = stat(file, pstat);
+    return rc;
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+int _unlink_r(struct _reent *ptr, const char *file)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    return unlink(file);
+#else
+    ptr->_errno = ENOTSUP;
+    return -1;
+#endif /* RT_LIBC_USING_FILEIO */
+}
+
+_ssize_t _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
+{
+#ifdef RT_LIBC_USING_FILEIO
+    _ssize_t rc;
+    if (libc_stdio_get_console() < 0 && fd == STDOUT_FILENO)
+    {
+        LOG_W("Do not invoke standard output before initializing libc");
+        return 0;
+    }
+    rc = write(fd, buf, nbytes);
+    return rc;
+#elif defined(RT_USING_CONSOLE)
+    if (STDOUT_FILENO == fd)
+    {
+        rt_device_t console;
+
+        console = rt_console_get_device();
+        if (console)
+            return rt_device_write(console, -1, buf, nbytes);
+    }
+#endif /* RT_LIBC_USING_FILEIO */
+    ptr->_errno = ENOTSUP;
+    return -1;
+}
+
+/* for exit() and abort() */
+__attribute__ ((noreturn)) void _exit (int status)
+{
+    extern void __rt_libc_exit(int status);
+    __rt_libc_exit(status);
+    while(1);
+}
+
 /*
 These functions are implemented and replaced by the 'common/time.c' file
 int _gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp);