Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
宁楠萍
rt-thread
提交
1f16147f
R
rt-thread
项目概览
宁楠萍
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1f16147f
编写于
10月 09, 2015
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge the patch to fix fd issue; lwIP protect issue
上级
8e439999
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
7 deletion
+15
-7
components/dfs/src/dfs_file.c
components/dfs/src/dfs_file.c
+5
-5
components/dfs/src/dfs_posix.c
components/dfs/src/dfs_posix.c
+4
-0
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
+4
-0
include/rtdef.h
include/rtdef.h
+1
-1
src/kservice.c
src/kservice.c
+1
-1
未找到文件。
components/dfs/src/dfs_file.c
浏览文件 @
1f16147f
...
...
@@ -21,6 +21,7 @@
* Date Author Notes
* 2005-02-22 Bernard The first version.
* 2011-12-08 Bernard Merges rename patch from iamcacy.
* 2015-05-27 Bernard Fix the fd clear issue.
*/
#include <dfs.h>
...
...
@@ -97,7 +98,7 @@ int dfs_file_open(struct dfs_fd *fd, const char *path, int flags)
{
/* clear fd */
rt_free
(
fd
->
path
);
rt_memset
(
fd
,
0
,
sizeof
(
*
fd
))
;
fd
->
path
=
RT_NULL
;
return
-
DFS_STATUS_ENOSYS
;
}
...
...
@@ -106,7 +107,7 @@ int dfs_file_open(struct dfs_fd *fd, const char *path, int flags)
{
/* clear fd */
rt_free
(
fd
->
path
);
rt_memset
(
fd
,
0
,
sizeof
(
*
fd
))
;
fd
->
path
=
RT_NULL
;
dfs_log
(
DFS_DEBUG_INFO
,
(
"open failed"
));
...
...
@@ -143,7 +144,7 @@ int dfs_file_close(struct dfs_fd *fd)
return
result
;
rt_free
(
fd
->
path
);
rt_memset
(
fd
,
0
,
sizeof
(
struct
dfs_fd
))
;
fd
->
path
=
RT_NULL
;
return
result
;
}
...
...
@@ -165,7 +166,7 @@ int dfs_file_ioctl(struct dfs_fd *fd, int cmd, void *args)
return
-
DFS_STATUS_EINVAL
;
fs
=
fd
->
fs
;
if
(
fs
->
ops
->
ioctl
!=
RT_NULL
)
if
(
fs
->
ops
->
ioctl
!=
RT_NULL
)
return
fs
->
ops
->
ioctl
(
fd
,
cmd
,
args
);
return
-
DFS_STATUS_ENOSYS
;
...
...
@@ -652,7 +653,6 @@ static void copyfile(const char *src, const char *dst)
extern
int
mkdir
(
const
char
*
path
,
mode_t
mode
);
static
void
copydir
(
const
char
*
src
,
const
char
*
dst
)
{
struct
dfs_fd
fd
;
struct
dirent
dirent
;
struct
stat
stat
;
int
length
;
...
...
components/dfs/src/dfs_posix.c
浏览文件 @
1f16147f
...
...
@@ -230,6 +230,7 @@ off_t lseek(int fd, off_t offset, int whence)
break
;
default:
fd_put
(
d
);
rt_set_errno
(
-
DFS_STATUS_EINVAL
);
return
-
1
;
...
...
@@ -237,6 +238,7 @@ off_t lseek(int fd, off_t offset, int whence)
if
(
offset
<
0
)
{
fd_put
(
d
);
rt_set_errno
(
-
DFS_STATUS_EINVAL
);
return
-
1
;
...
...
@@ -427,6 +429,7 @@ int mkdir(const char *path, mode_t mode)
if
(
result
<
0
)
{
fd_put
(
d
);
fd_put
(
d
);
rt_set_errno
(
result
);
...
...
@@ -435,6 +438,7 @@ int mkdir(const char *path, mode_t mode)
dfs_file_close
(
d
);
fd_put
(
d
);
fd_put
(
d
);
return
0
;
}
...
...
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
浏览文件 @
1f16147f
...
...
@@ -103,5 +103,9 @@ void sys_arch_assert(const char* file, int line);
#include "string.h"
#define SYS_ARCH_DECL_PROTECT(level)
#define SYS_ARCH_PROTECT(level) rt_enter_critical()
#define SYS_ARCH_UNPROTECT(level) rt_exit_critical()
#endif
/* __ARCH_CC_H__ */
include/rtdef.h
浏览文件 @
1f16147f
/*
* File : rtdef.h
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006 - 201
2
, RT-Thread Development Team
* COPYRIGHT (C) 2006 - 201
5
, RT-Thread Development Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
src/kservice.c
浏览文件 @
1f16147f
...
...
@@ -1072,8 +1072,8 @@ rt_device_t rt_console_set_device(const char *name)
}
/* set new console device */
rt_device_open
(
new
,
RT_DEVICE_OFLAG_RDWR
|
RT_DEVICE_FLAG_STREAM
);
_console_device
=
new
;
rt_device_open
(
_console_device
,
RT_DEVICE_OFLAG_RDWR
);
}
return
old
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录