Merge pull request #1 from RT-Thread/master

同步原有仓库

6 files changed, 39 insertions, 12 deletions

diff --git a/components/libc/compilers/armlibc/fcntl.h b/components/libc/compilers/armlibc/fcntl.h
index 80cf1b4409..3e650a8471 100644
--- a/components/libc/compilers/armlibc/fcntl.h
+++ b/components/libc/compilers/armlibc/fcntl.h
@@ -9,6 +9,8 @@
 #ifndef FCNTL_H__
 #define FCNTL_H__
 
+#include <rtconfig.h>
+
 #ifdef RT_USING_DFS
 #include <dfs_posix.h>
 #endif
diff --git a/components/libc/compilers/armlibc/stubs.c b/components/libc/compilers/armlibc/stubs.c
index b6ffb37b0f..b4cc13799e 100644
--- a/components/libc/compilers/armlibc/stubs.c
+++ b/components/libc/compilers/armlibc/stubs.c
@@ -9,6 +9,8 @@
  * 2013-11-24     aozima       fixed _sys_read()/_sys_write() issues.
  * 2014-08-03     bernard      If using msh, use system() implementation
  *                             in msh.
+ * 2020-08-05     Meco Man     fixed _sys_flen() compiling-warning when 
+ *                             RT_USING_DFS is not defined
  */
 
 #include <string.h>
@@ -265,16 +267,16 @@ RT_WEAK void _sys_exit(int return_code)
  */
 long _sys_flen(FILEHANDLE fh)
 {
+#ifdef RT_USING_DFS
     struct stat stat;
-    
+
     if (fh < STDERR)
         return -1;
 
-#ifndef RT_USING_DFS
-    return -1;
-#else
     fstat(fh, &stat);
     return stat.st_size;
+#else
+    return -1;
 #endif
 }
 
diff --git a/components/libc/compilers/armlibc/termios.h b/components/libc/compilers/armlibc/sys/ioctl.h
index 1956121225..033a57014a 100644
--- a/components/libc/compilers/armlibc/termios.h
+++ b/components/libc/compilers/armlibc/sys/ioctl.h
@@ -5,11 +5,11 @@
  *
  * Change Logs:
  * Date           Author       Notes
+ * 2020-09-01     Meco Man     First Version
  */
-#ifndef _TERMIOS_H__
-#define _TERMIOS_H__
+#ifndef _SYS_IOCTL_H
+#define _SYS_IOCTL_H
+
 
-#include <sys/types.h>
-#include <posix_termios.h>
 
 #endif
diff --git a/components/libc/compilers/armlibc/sys/types.h b/components/libc/compilers/armlibc/sys/types.h
index 001ace4dd2..2aad77c99d 100644
--- a/components/libc/compilers/armlibc/sys/types.h
+++ b/components/libc/compilers/armlibc/sys/types.h
@@ -5,16 +5,16 @@
  *
  * Change Logs:
  * Date           Author       Notes
+ * 2020-09-05 Meco Man  fix bugs
  */
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
 #include <stdint.h>
-#include <rtthread.h>
 
-typedef rt_int32_t clockid_t;
-typedef rt_int32_t key_t;       /* Used for interprocess communication. */
-typedef rt_int32_t pid_t;       /* Used for process IDs and process group IDs. */
+typedef int32_t clockid_t;
+typedef int32_t key_t;       /* Used for interprocess communication. */
+typedef int32_t pid_t;       /* Used for process IDs and process group IDs. */
 #ifndef ARCH_CPU_64BIT
 typedef signed int   ssize_t;  /* Used for a count of bytes or an error indication. */
 #else
diff --git a/components/libc/compilers/armlibc/sys/unistd.h b/components/libc/compilers/armlibc/sys/unistd.h
index 33f0561e72..524de2cf83 100644
--- a/components/libc/compilers/armlibc/sys/unistd.h
+++ b/components/libc/compilers/armlibc/sys/unistd.h
@@ -36,14 +36,36 @@
 #define _FNDELAY    _FNONBLOCK  /* non blocking I/O (4.2 style) */
 #define _FNOCTTY    0x8000  /* don't assign a ctty on this open */
 
+
+#ifndef O_RDONLY
 #define O_RDONLY    0       /* +1 == FREAD */
+#endif
+#ifndef O_WRONLY
 #define O_WRONLY    1       /* +1 == FWRITE */
+#endif
+#ifndef O_RDWR
 #define O_RDWR      2       /* +1 == FREAD|FWRITE */
+#endif
+#ifndef O_APPEND
 #define O_APPEND    _FAPPEND
+#endif
+#ifndef O_CREAT
 #define O_CREAT     _FCREAT
+#endif
+#ifndef O_TRUNC
 #define O_TRUNC     _FTRUNC
+#endif
+#ifndef O_EXCL
 #define O_EXCL      _FEXCL
+#endif
+#ifndef O_SYNC
 #define O_SYNC      _FSYNC
 #endif
 
+#endif
+
+
+int     isatty      (int fd);
+char *  ttyname     (int desc);
+
 #endif /* _SYS_UNISTD_H */
diff --git a/components/libc/compilers/armlibc/unistd.h b/components/libc/compilers/armlibc/unistd.h
index 70187722d8..736fc219a8 100644
--- a/components/libc/compilers/armlibc/unistd.h
+++ b/components/libc/compilers/armlibc/unistd.h
@@ -7,3 +7,4 @@
  * Date           Author       Notes
  */
 #include "sys/unistd.h"
+