diff options
| author | Bernard Xiong <[email protected]> | 2018-02-11 14:39:22 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-11 14:39:22 +0800 |
| commit | 2e71b8a741000c0ccf9852933a2a1bf65eb607dd (patch) | |
| tree | 04ec29c04891be9e8bab88d8ea33e2ccda52418b /components | |
| parent | 915ba043af321f042314cfd9cd6ab39f69b16ed4 (diff) | |
| parent | 43cc01742fc5cce22ccd2037ba80216c5207fc6a (diff) | |
Merge pull request #1221 from BernardXiong/master
merge O_CREAT issue
Diffstat (limited to 'components')
| -rw-r--r-- | components/cplusplus/Thread.cpp | 4 | ||||
| -rw-r--r-- | components/dfs/filesystems/devfs/devfs.c | 4 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/libc.c | 5 | ||||
| -rw-r--r-- | components/libc/compilers/newlib/stdio.c | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/components/cplusplus/Thread.cpp b/components/cplusplus/Thread.cpp index 4d2d8a59ea..a01bd95e4b 100644 --- a/components/cplusplus/Thread.cpp +++ b/components/cplusplus/Thread.cpp @@ -6,7 +6,7 @@ Thread::Thread(rt_uint32_t stack_size, rt_uint8_t priority, rt_uint32_t tick, const char *name) -: _entry(RT_NULL), started(false) +: _entry(RT_NULL), _param(RT_NULL), started(false) { rt_event_init(&_event, name, 0); @@ -24,7 +24,7 @@ Thread::Thread(void (*entry)(void *p), rt_uint8_t priority, rt_uint32_t tick, const char *name) -: _entry(RT_NULL), started(false), _param(p) +: _entry(RT_NULL), _param(p), started(false) { rt_event_init(&_event, name, 0); diff --git a/components/dfs/filesystems/devfs/devfs.c b/components/dfs/filesystems/devfs/devfs.c index 4f2f0ebcd9..4694b96c85 100644 --- a/components/dfs/filesystems/devfs/devfs.c +++ b/components/dfs/filesystems/devfs/devfs.c @@ -19,6 +19,7 @@ * * Change Logs: * Date Author Notes + * 2018-02-11 Bernard Ignore O_CREAT flag in open. */ #include <rtthread.h> @@ -137,9 +138,6 @@ int dfs_device_fs_open(struct dfs_fd *file) rt_err_t result; rt_device_t device; - if (file->flags & O_CREAT) - return -EINVAL; - /* open root directory */ if ((file->path[0] == '/') && (file->path[1] == '\0') && (file->flags & O_DIRECTORY)) diff --git a/components/libc/compilers/dlib/libc.c b/components/libc/compilers/dlib/libc.c index fe219537e3..fa977ab399 100644 --- a/components/libc/compilers/dlib/libc.c +++ b/components/libc/compilers/dlib/libc.c @@ -36,7 +36,7 @@ int libc_system_init(void) { -#if defined(RT_USING_DFS) & defined(RT_USING_DFS_DEVFS) +#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS) rt_device_t dev_console; dev_console = rt_console_get_device(); @@ -50,10 +50,11 @@ int libc_system_init(void) } #endif -#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT +#if defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) pthread_system_init(); #endif return 0; } INIT_COMPONENT_EXPORT(libc_system_init); + diff --git a/components/libc/compilers/newlib/stdio.c b/components/libc/compilers/newlib/stdio.c index f28383818d..9a225622b5 100644 --- a/components/libc/compilers/newlib/stdio.c +++ b/components/libc/compilers/newlib/stdio.c @@ -81,7 +81,9 @@ int libc_stdio_set_console(const char* device_name, int mode) _GLOBAL_REENT->__sdidinit = 1; } - return fileno(std_console); + if (std_console) return fileno(std_console); + + return -1; } int libc_stdio_get_console(void) { |