Merge branch 'master' into security

7 files changed, 36 insertions, 214 deletions

diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript
index b1ad6e4784..542cdecd40 100644
--- a/components/libc/compilers/newlib/SConscript
+++ b/components/libc/compilers/newlib/SConscript
@@ -4,17 +4,18 @@ Import('rtconfig')
 src = []
 cwd = GetCurrentDir()
 group = []
-
+LIBS = []
+CPPDEFINES = []
 CPPPATH = [cwd]
 
 if rtconfig.PLATFORM == 'gcc':
     if GetDepend('RT_USING_LIBC'):
-        CPPDEFINES = ['RT_USING_NEWLIB']
+        CPPDEFINES += ['RT_USING_NEWLIB']
         # link with libc and libm:
         # libm is a frequently used lib. Newlib is compiled with -ffunction-sections in
         # recent GCC tool chains. The linker would just link in the functions that have
         # been referenced. So setting this won't result in bigger text size.
-        LIBS = ['c', 'm']
+        LIBS += ['c', 'm']
 
         src += Glob('*.c')
         SrcRemove(src, ['minilib.c'])
@@ -22,8 +23,6 @@ if rtconfig.PLATFORM == 'gcc':
             SrcRemove(src, ['libc_syms.c'])
     else:
         src += ['minilib.c']
-        CPPDEFINES = []
-        LIBS = []
 
     group = DefineGroup('libc', src, depend = [], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
 
diff --git a/components/libc/compilers/newlib/minilib.c b/components/libc/compilers/newlib/minilib.c
index f6df38f67b..612554ca66 100644
--- a/components/libc/compilers/newlib/minilib.c
+++ b/components/libc/compilers/newlib/minilib.c
@@ -12,8 +12,9 @@
 #include <rtthread.h>
 
 #ifdef RT_USING_HEAP /* Memory routine */
-void *
-_malloc_r (struct _reent *ptr, size_t size)
+#include <sys/errno.h>
+
+void * _malloc_r (struct _reent *ptr, size_t size)
 {
     void* result;
 
@@ -26,8 +27,7 @@ _malloc_r (struct _reent *ptr, size_t size)
     return result;
 }
 
-void *
-_realloc_r (struct _reent *ptr, void *old, size_t newlen)
+void * _realloc_r (struct _reent *ptr, void *old, size_t newlen)
 {
     void* result;
 
@@ -53,15 +53,13 @@ void *_calloc_r (struct _reent *ptr, size_t size, size_t len)
     return result;
 }
 
-void
-_free_r (struct _reent *ptr, void *addr)
+void _free_r (struct _reent *ptr, void *addr)
 {
     rt_free (addr);
 }
 
 #else
-void *
-_sbrk_r(struct _reent *ptr, ptrdiff_t incr)
+void * _sbrk_r(struct _reent *ptr, ptrdiff_t incr)
 {
     return RT_NULL;
 }
diff --git a/components/libc/compilers/newlib/sys/dirent.h b/components/libc/compilers/newlib/sys/dirent.h
deleted file mode 100644
index bfba586093..0000000000
--- a/components/libc/compilers/newlib/sys/dirent.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- */
-#ifndef __RTT_DIRENT_H__
-#define __RTT_DIRENT_H__
-
-#include <rtthread.h>
-
-/*
-* dirent.h - format of directory entries
- * Ref: http://www.opengroup.org/onlinepubs/009695399/basedefs/dirent.h.html
- */
-
-/* File types */
-#define FT_REGULAR      0   /* regular file */
-#define FT_SOCKET       1   /* socket file  */
-#define FT_DIRECTORY    2   /* directory    */
-#define FT_USER         3   /* user defined */
-
-#define DT_UNKNOWN      0x00
-#define DT_REG          0x01
-#define DT_DIR          0x02
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef HAVE_DIR_STRUCTURE
-typedef struct
-{
-    int fd;                         /* directory file */
-    char buf[512];
-    int num;
-    int cur;
-} DIR;
-#endif
-
-#ifndef HAVE_DIRENT_STRUCTURE
-struct dirent
-{
-    rt_uint8_t  d_type;             /* The type of the file */
-    rt_uint8_t  d_namlen;           /* The length of the not including the terminating null file name */
-    rt_uint16_t d_reclen;           /* length of this record */
-    char d_name[256];               /* The null-terminated file name */
-};
-#endif
-
-int            closedir(DIR *);
-DIR           *opendir(const char *);
-struct dirent *readdir(DIR *);
-int            readdir_r(DIR *, struct dirent *, struct dirent **);
-void           rewinddir(DIR *);
-void           seekdir(DIR *, long int);
-long           telldir(DIR *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/components/libc/compilers/newlib/sys/mman.h b/components/libc/compilers/newlib/sys/mman.h
deleted file mode 100644
index 6a260ccd70..0000000000
--- a/components/libc/compilers/newlib/sys/mman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2017/11/30     Bernard      The first version.
- */
-
-#ifndef _SYS_MMAN_H
-#define _SYS_MMAN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAP_FAILED     ((void *) -1)
-
-#define MAP_SHARED     0x01
-#define MAP_PRIVATE    0x02
-#define MAP_TYPE       0x0f
-#define MAP_FIXED      0x10
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-#define MAP_FILE       0
-
-#define PROT_NONE      0
-#define PROT_READ      1
-#define PROT_WRITE     2
-#define PROT_EXEC      4
-#define PROT_GROWSDOWN 0x01000000
-#define PROT_GROWSUP   0x02000000
-
-#define MS_ASYNC       1
-#define MS_INVALIDATE  2
-#define MS_SYNC        4
-
-#define MCL_CURRENT    1
-#define MCL_FUTURE     2
-#define MCL_ONFAULT    4
-
-void *mmap (void *start, size_t len, int prot, int flags, int fd, off_t off);
-int munmap (void *start, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/components/libc/compilers/newlib/sys/statfs.h b/components/libc/compilers/newlib/sys/statfs.h
deleted file mode 100644
index 0996af9a18..0000000000
--- a/components/libc/compilers/newlib/sys/statfs.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- */
-#ifndef __RTT_STATFS_H__
-#define __RTT_STATFS_H__
-
-#include <rtthread.h>
-
-struct statfs
-{
-    rt_size_t f_bsize;   /* block size */
-    rt_size_t f_blocks;  /* total data blocks in file system */
-    rt_size_t f_bfree;   /* free blocks in file system */
-};
-
-#endif
diff --git a/components/libc/compilers/newlib/sys/termios.h b/components/libc/compilers/newlib/sys/termios.h
deleted file mode 100644
index c4b42083c4..0000000000
--- a/components/libc/compilers/newlib/sys/termios.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- */
diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c
index 6cbc11fd6a..aeb4d123e7 100644
--- a/components/libc/compilers/newlib/syscalls.c
+++ b/components/libc/compilers/newlib/syscalls.c
@@ -29,21 +29,18 @@
 /* Reentrant versions of system calls.  */
 
 #ifndef _REENT_ONLY
-int *
-__errno ()
+int *__errno ()
 {
   return _rt_errno();
 }
 #endif
 
-int
-_getpid_r(struct _reent *ptr)
+int _getpid_r(struct _reent *ptr)
 {
     return 0;
 }
 
-int
-_close_r(struct _reent *ptr, int fd)
+int _close_r(struct _reent *ptr, int fd)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -54,40 +51,35 @@ _close_r(struct _reent *ptr, int fd)
 #endif
 }
 
-int
-_execve_r(struct _reent *ptr, const char * name, char *const *argv, char *const *env)
+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)
+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)
+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)
+int _fstat_r(struct _reent *ptr, int fd, struct stat *pstat)
 {
     /* return "not supported" */
     ptr->_errno = ENOTSUP;
     return -1;
 }
 
-int
-_isatty_r(struct _reent *ptr, int fd)
+int _isatty_r(struct _reent *ptr, int fd)
 {
     if (fd >=0 && fd < 3)
     {
@@ -98,24 +90,22 @@ _isatty_r(struct _reent *ptr, int fd)
         return 0;
     }
 }
-int
-_kill_r(struct _reent *ptr, int pid, int sig)
+
+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)
+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)
+_off_t _lseek_r(struct _reent *ptr, int fd, _off_t pos, int whence)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -129,8 +119,7 @@ _lseek_r(struct _reent *ptr, int fd, _off_t pos, int whence)
 #endif
 }
 
-int
-_mkdir_r(struct _reent *ptr, const char *name, int mode)
+int _mkdir_r(struct _reent *ptr, const char *name, int mode)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -144,8 +133,7 @@ _mkdir_r(struct _reent *ptr, const char *name, int mode)
 #endif
 }
 
-int
-_open_r(struct _reent *ptr, const char *file, int flags, int mode)
+int _open_r(struct _reent *ptr, const char *file, int flags, int mode)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -159,8 +147,7 @@ _open_r(struct _reent *ptr, const char *file, int flags, int mode)
 #endif
 }
 
-_ssize_t
-_read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
+_ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -174,8 +161,7 @@ _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
 #endif
 }
 
-int
-_rename_r(struct _reent *ptr, const char *old, const char *new)
+int _rename_r(struct _reent *ptr, const char *old, const char *new)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -189,8 +175,7 @@ _rename_r(struct _reent *ptr, const char *old, const char *new)
 #endif
 }
 
-int
-_stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
+int _stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -204,8 +189,7 @@ _stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
 #endif
 }
 
-int
-_unlink_r(struct _reent *ptr, const char *file)
+int _unlink_r(struct _reent *ptr, const char *file)
 {
 #ifndef RT_USING_DFS
     /* return "not supported" */
@@ -216,19 +200,17 @@ _unlink_r(struct _reent *ptr, const char *file)
 #endif
 }
 
-int
-_wait_r(struct _reent *ptr, int *status)
+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)
+_ssize_t _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
 {
 #ifndef RT_USING_DFS
-#ifdef RT_USING_DEVICE
+#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
     if (fileno(stdout) == fd)
     {
         rt_device_t console;
@@ -252,8 +234,7 @@ _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
 }
 
 #ifdef RT_USING_HEAP /* Memory routine */
-void *
-_malloc_r (struct _reent *ptr, size_t size)
+void *_malloc_r (struct _reent *ptr, size_t size)
 {
     void* result;
 
@@ -266,8 +247,7 @@ _malloc_r (struct _reent *ptr, size_t size)
     return result;
 }
 
-void *
-_realloc_r (struct _reent *ptr, void *old, size_t newlen)
+void *_realloc_r (struct _reent *ptr, void *old, size_t newlen)
 {
     void* result;
 
@@ -293,8 +273,7 @@ void *_calloc_r (struct _reent *ptr, size_t size, size_t len)
     return result;
 }
 
-void
-_free_r (struct _reent *ptr, void *addr)
+void _free_r (struct _reent *ptr, void *addr)
 {
     rt_free (addr);
 }
@@ -308,16 +287,14 @@ _sbrk_r(struct _reent *ptr, ptrdiff_t incr)
 #endif /*RT_USING_HEAP*/
 
 /* for exit() and abort() */
-__attribute__ ((noreturn)) void
-_exit (int status)
+__attribute__ ((noreturn)) void _exit (int status)
 {
     extern void __rt_libc_exit(int status);
     __rt_libc_exit(status);
     while(1);
 }
 
-void
-_system(const char *s)
+void _system(const char *s)
 {
     extern int __rt_libc_system(const char *string);
     __rt_libc_system(s);