diff options
| author | liqiwen <[email protected]> | 2021-10-27 19:57:28 +0800 |
|---|---|---|
| committer | liqiwen <[email protected]> | 2021-10-27 19:57:28 +0800 |
| commit | 9f100ce9805d06d5fa132e3b65fcf2050a7b860b (patch) | |
| tree | 638536b0cfc29db17973c6e650aec81cade2ab3d /components/libc/compilers/dlib/syscall_read.c | |
| parent | bbabae442906c8e9f302092532e655f80d24b9ac (diff) | |
| parent | bb859e79e0836f27030adcf8a8e9afb26ae4dab4 (diff) | |
Merge branch 'master' of github.com:RT-Thread/rt-thread into dev_li
Diffstat (limited to 'components/libc/compilers/dlib/syscall_read.c')
| -rw-r--r-- | components/libc/compilers/dlib/syscall_read.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/components/libc/compilers/dlib/syscall_read.c b/components/libc/compilers/dlib/syscall_read.c index ae980be6ca..f65b502966 100644 --- a/components/libc/compilers/dlib/syscall_read.c +++ b/components/libc/compilers/dlib/syscall_read.c @@ -9,10 +9,8 @@ */ #include <rtthread.h> -#ifdef RT_USING_DFS -#include <dfs_posix.h> -#endif #include <yfuns.h> +#include <unistd.h> #include "libc.h" #define DBG_TAG "dlib.syscall_read" @@ -22,32 +20,26 @@ #pragma module_name = "?__read" size_t __read(int handle, unsigned char *buf, size_t len) { -#ifdef RT_USING_DFS +#ifdef RT_LIBC_USING_FILEIO int size; -#endif if (handle == _LLIO_STDIN) { -#ifdef RT_USING_POSIX if (libc_stdio_get_console() < 0) { LOG_W("Do not invoke standard input before initializing libc"); return 0; } return read(STDIN_FILENO, buf, len); -#else - return _LLIO_ERROR; -#endif } else if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR)) { return _LLIO_ERROR; } -#ifndef RT_USING_DFS - return _LLIO_ERROR; -#else size = read(handle, buf, len); return size; -#endif +#else + return _LLIO_ERROR; +#endif /* RT_LIBC_USING_FILEIO */ } |
