diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c index d942bdb984060eec8c77f6f688667166b42cb992..a3ba57a28050caf45170dc473e711d2f08f911c4 100644 --- a/components/libc/compilers/armlibc/syscalls.c +++ b/components/libc/compilers/armlibc/syscalls.c @@ -25,6 +25,10 @@ #include #endif +#define DBG_TAG "armlibc.syscalls" +#define DBG_LVL DBG_INFO +#include + #ifdef __CLANG_ARM __asm(".global __use_no_semihosting\n\t"); #else @@ -146,6 +150,11 @@ int _sys_read(FILEHANDLE fh, unsigned char *buf, unsigned len, int mode) if (fh == STDIN) { #ifdef RT_USING_POSIX + if (libc_stdio_get_console() < 0) + { + LOG_E("invoke standard output before initializing libc"); + return -1; + } size = read(STDIN_FILENO, buf, len); return len - size; #else @@ -186,6 +195,11 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode) return 0; #else #ifdef RT_USING_POSIX + if (libc_stdio_get_console() < 0) + { + LOG_E("invoke standard input before initializing libc"); + return -1; + } size = write(STDOUT_FILENO, buf, len); return len - size; #else diff --git a/components/libc/compilers/dlib/syscall_read.c b/components/libc/compilers/dlib/syscall_read.c index e716d0b024c916488e1b322a0cb426e61da503c8..bdc694b7d8fb1e180ec927dbcc68b91dd976cdf6 100644 --- a/components/libc/compilers/dlib/syscall_read.c +++ b/components/libc/compilers/dlib/syscall_read.c @@ -15,6 +15,10 @@ #include #include "libc.h" +#define DBG_TAG "dlib.syscall_read" +#define DBG_LVL DBG_INFO +#include + #pragma module_name = "?__read" size_t __read(int handle, unsigned char *buf, size_t len) { @@ -25,6 +29,11 @@ size_t __read(int handle, unsigned char *buf, size_t len) if (handle == _LLIO_STDIN) { #ifdef RT_USING_POSIX + if (libc_stdio_get_console() < 0) + { + LOG_E("invoke standard input before initializing libc"); + return _LLIO_ERROR; + } return read(STDIN_FILENO, buf, len); #else return _LLIO_ERROR; diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c index a5462653bf74de3713768201d57ecd9716f24a9d..bd7cc83d999871a130978fa8904800dacf54eff8 100644 --- a/components/libc/compilers/dlib/syscall_write.c +++ b/components/libc/compilers/dlib/syscall_write.c @@ -15,6 +15,10 @@ #include #include "libc.h" +#define DBG_TAG "dlib.syscall_write" +#define DBG_LVL DBG_INFO +#include + #pragma module_name = "?__write" size_t __write(int handle, const unsigned char *buf, size_t len) @@ -30,6 +34,11 @@ size_t __write(int handle, const unsigned char *buf, size_t len) #else #ifdef RT_USING_POSIX + if (libc_stdio_get_console() < 0) + { + LOG_E("invoke standard output before initializing libc"); + return _LLIO_ERROR; + } return write(STDOUT_FILENO, (void*)buf, len); #else rt_device_t console_device; diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c index aeb4d123e7a4a05277bcc6d51e1cb915f69c625c..d46a26440813c9602808f1da61fbd8adb60477bf 100644 --- a/components/libc/compilers/newlib/syscalls.c +++ b/components/libc/compilers/newlib/syscalls.c @@ -26,6 +26,10 @@ #include #endif +#define DBG_TAG "newlib.syscalls" +#define DBG_LVL DBG_INFO +#include + /* Reentrant versions of system calls. */ #ifndef _REENT_ONLY @@ -155,7 +159,11 @@ _ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes) return -1; #else _ssize_t rc; - + if (libc_stdio_get_console() < 0 && fd == STDIN_FILENO) + { + LOG_E("invoke standard input before initializing libc"); + return -1; + } rc = read(fd, buf, nbytes); return rc; #endif @@ -227,7 +235,11 @@ _ssize_t _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes) #endif /*RT_USING_DEVICE*/ #else _ssize_t rc; - + if (libc_stdio_get_console() < 0 && fd == STDOUT_FILENO) + { + LOG_E("invoke standard output before initializing libc"); + return -1; + } rc = write(fd, buf, nbytes); return rc; #endif