Merge pull request #1233 from RT-Thread/origin/stable-v2.1.xstable-v2.1.x

fix the fopen issue.

3 files changed, 29 insertions, 30 deletions

diff --git a/components/libc/newlib/libc.c b/components/libc/newlib/libc.c
index 8f97e1c8b4..96711784c2 100644
--- a/components/libc/newlib/libc.c
+++ b/components/libc/newlib/libc.c
@@ -21,7 +21,6 @@
 int libc_system_init(void)
 {
 #ifdef RT_USING_DFS
-    int fd;
     struct rt_device *console_dev;
 
 #ifndef RT_USING_DFS_DEVFS
@@ -33,14 +32,6 @@ int libc_system_init(void)
     {
         /* initialize console device */
         rt_console_init(console_dev->parent.name);
-
-        /* open console as stdin/stdout/stderr */
-        fd = open("/dev/console", O_RDONLY, 0); /* for stdin */
-        fd = open("/dev/console", O_WRONLY, 0); /* for stdout */
-        fd = open("/dev/console", O_WRONLY, 0); /* for stderr */
-
-        /* skip warning */
-        fd = fd;
     }
 #endif
 
diff --git a/components/libc/newlib/sys/fcntl.h b/components/libc/newlib/sys/fcntl.h
deleted file mode 100644
index 499c67260e..0000000000
--- a/components/libc/newlib/sys/fcntl.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __RTT_FCNTL_H__
-#define __RTT_FCNTL_H__
-
-/* Operation flags */
-#define O_RDONLY        0x0000000
-#define O_WRONLY        0x0000001
-#define O_RDWR          0x0000002
-#define O_ACCMODE       0x0000003
-#define O_CREAT         0x0000100
-#define O_EXCL          0x0000200
-#define O_TRUNC         0x0001000
-#define O_APPEND        0x0002000
-#define O_DIRECTORY     0x0200000
-#define O_BINARY        0x0008000
-
-#endif
diff --git a/components/libc/newlib/syscalls.c b/components/libc/newlib/syscalls.c
index ff09a4fe80..4dcf534220 100644
--- a/components/libc/newlib/syscalls.c
+++ b/components/libc/newlib/syscalls.c
@@ -3,6 +3,8 @@
 #include <sys/time.h>
 #include <rtthread.h>
 
+#include <stdio.h>
+
 #ifdef RT_USING_DFS
 #include <dfs_posix.h>
 #endif
@@ -12,6 +14,8 @@
 #endif
 
 /* Reentrant versions of system calls.  */
+static int __console_fd = -1;
+int dump = 0;
 
 int
 _close_r(struct _reent *ptr, int fd)
@@ -205,18 +209,14 @@ _wait_r(struct _reent *ptr, int *status)
 _ssize_t
 _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
 {
-	if (fd < 3)
+	if (fd == __console_fd)
 	{
-#ifdef RT_USING_CONSOLE
 		rt_device_t console_device;
 		extern rt_device_t rt_console_get_device(void);
 
 		console_device = rt_console_get_device();
 		if (console_device != 0) rt_device_write(console_device, 0, buf, nbytes);
 		return nbytes;
-#else
-        return 0;
-#endif
 	}
 	else
 	{
@@ -462,3 +462,27 @@ void abort(void)
 
 	while (1);
 }
+
+int libc_console_init(void)
+{
+#ifdef RT_USING_DFS
+
+    /* open console as stdin/stdout/stderr */
+    __console_fd = open("/dev/console", O_RDWR, 0); /* for stdin/stdout/stderr */
+
+	if (__console_fd >= 0)
+	{
+		_GLOBAL_REENT->_stdin   = fdopen(__console_fd, "r");
+
+		_GLOBAL_REENT->_stdout  = fdopen(__console_fd, "w");
+		setvbuf(_GLOBAL_REENT->_stdout, NULL, _IONBF, 0);
+		_GLOBAL_REENT->_stderr  = fdopen(__console_fd, "w");
+		setvbuf(_GLOBAL_REENT->_stderr, NULL, _IONBF, 0);
+
+		_GLOBAL_REENT->__sdidinit = 1;
+	}
+#endif
+
+    return 0;
+}
+INIT_APP_EXPORT(libc_console_init);