diff options
| author | Bernard Xiong <[email protected]> | 2019-01-07 18:05:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-07 18:05:42 +0800 |
| commit | 3dd0ebe6e7d8d0ad7605269ef8fffd66a8029931 (patch) | |
| tree | 061872604b61531dc3faaf9e42e3634ff61ce7c5 /components/libc | |
| parent | d113eb07f5157696275a508f991e1b837a1506f7 (diff) | |
| parent | 18dfb50e9b9469b2e36e7fa9ee9abf5d48108dbb (diff) | |
Merge pull request #2158 from armink/lts-v3.1.x
Lts v3.1.x
Diffstat (limited to 'components/libc')
| -rw-r--r-- | components/libc/compilers/armlibc/stubs.c | 5 | ||||
| -rw-r--r-- | components/libc/compilers/newlib/syscalls.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/components/libc/compilers/armlibc/stubs.c b/components/libc/compilers/armlibc/stubs.c index 6e9f13d143..820daeff39 100644 --- a/components/libc/compilers/armlibc/stubs.c +++ b/components/libc/compilers/armlibc/stubs.c @@ -270,7 +270,10 @@ long _sys_flen(FILEHANDLE fh) int _sys_istty(FILEHANDLE fh) { - return 0; + if((STDIN <= fh) && (fh <= STDERR)) + return 1; + else + return 0; } int remove(const char *filename) diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c index e4cda478cb..759feafe67 100644 --- a/components/libc/compilers/newlib/syscalls.c +++ b/components/libc/compilers/newlib/syscalls.c @@ -9,6 +9,8 @@ #include <reent.h> #include <sys/errno.h> #include <sys/time.h> +#include <stdio.h> + #include <rtthread.h> #ifdef RT_USING_DFS @@ -218,7 +220,7 @@ _ssize_t _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes) { #ifndef RT_USING_DFS - if (fd == 0) + if (fileno(stdout) == fd) { rt_device_t console; |