Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
f98b0e74
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
接近 2 年 前同步成功
通知
3
Star
37
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Startup Init Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f98b0e74
编写于
10月 27, 2021
作者:
X
xionglei6
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
init: fix bugs
Signed-off-by:
N
xionglei6
<
xionglei6@huawei.com
>
上级
1135c557
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
14 deletion
+5
-14
services/init/init_service_file.c
services/init/init_service_file.c
+3
-14
services/test/unittest/BUILD.gn
services/test/unittest/BUILD.gn
+2
-0
未找到文件。
services/init/init_service_file.c
浏览文件 @
f98b0e74
...
@@ -63,24 +63,13 @@ static int CreateFile(ServiceFile *file)
...
@@ -63,24 +63,13 @@ static int CreateFile(ServiceFile *file)
static
int
SetFileEnv
(
int
fd
,
const
char
*
pathName
)
static
int
SetFileEnv
(
int
fd
,
const
char
*
pathName
)
{
{
INIT_ERROR_CHECK
(
pathName
!=
NULL
,
return
-
1
,
"Invalid fileName"
);
INIT_ERROR_CHECK
(
pathName
!=
NULL
,
return
-
1
,
"Invalid fileName"
);
char
*
name
=
(
char
*
)
calloc
(
1
,
strlen
(
pathName
)
+
1
);
char
pubName
[
PATH_MAX
]
=
{
0
};
INIT_CHECK
(
name
!=
NULL
,
return
-
1
);
if
(
snprintf_s
(
pubName
,
sizeof
(
pubName
),
sizeof
(
pubName
)
-
1
,
HOS_FILE_ENV_PREFIX
"%s"
,
pathName
)
<
0
)
{
if
(
strncpy_s
(
name
,
strlen
(
pathName
)
+
1
,
pathName
,
strlen
(
pathName
))
<
0
)
{
INIT_LOGE
(
"Failed strncpy_s err=%d"
,
errno
);
free
(
name
);
return
-
1
;
}
if
(
StringReplaceChr
(
name
,
'/'
,
'_'
)
<
0
)
{
free
(
name
);
return
-
1
;
return
-
1
;
}
}
if
(
StringReplaceChr
(
pubName
,
'/'
,
'_'
)
<
0
)
{
char
pubName
[
PATH_MAX
]
=
{
0
};
if
(
snprintf_s
(
pubName
,
sizeof
(
pubName
),
sizeof
(
pubName
)
-
1
,
HOS_FILE_ENV_PREFIX
"%s"
,
name
)
<
0
)
{
free
(
name
);
return
-
1
;
return
-
1
;
}
}
free
(
name
);
char
val
[
MAX_FILE_FD_LEN
]
=
{
0
};
char
val
[
MAX_FILE_FD_LEN
]
=
{
0
};
if
(
snprintf_s
(
val
,
sizeof
(
val
),
sizeof
(
val
)
-
1
,
"%d"
,
fd
)
<
0
)
{
if
(
snprintf_s
(
val
,
sizeof
(
val
),
sizeof
(
val
)
-
1
,
"%d"
,
fd
)
<
0
)
{
return
-
1
;
return
-
1
;
...
...
services/test/unittest/BUILD.gn
浏览文件 @
f98b0e74
...
@@ -34,6 +34,7 @@ ohos_unittest("init_ut") {
...
@@ -34,6 +34,7 @@ ohos_unittest("init_ut") {
sources = [
sources = [
"//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab.c",
"//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab.c",
"//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab_mount.c",
"//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab_mount.c",
"//base/startup/init_lite/interfaces/innerkits/file/init_file.c",
"//base/startup/init_lite/services/init/adapter/init_adapter.c",
"//base/startup/init_lite/services/init/adapter/init_adapter.c",
"//base/startup/init_lite/services/init/init_capability.c",
"//base/startup/init_lite/services/init/init_capability.c",
"//base/startup/init_lite/services/init/init_common_cmds.c",
"//base/startup/init_lite/services/init/init_common_cmds.c",
...
@@ -41,6 +42,7 @@ ohos_unittest("init_ut") {
...
@@ -41,6 +42,7 @@ ohos_unittest("init_ut") {
"//base/startup/init_lite/services/init/init_config.c",
"//base/startup/init_lite/services/init/init_config.c",
"//base/startup/init_lite/services/init/init_service_manager.c",
"//base/startup/init_lite/services/init/init_service_manager.c",
"//base/startup/init_lite/services/init/init_service_socket.c",
"//base/startup/init_lite/services/init/init_service_socket.c",
"//base/startup/init_lite/services/init/init_service_file.c",
"//base/startup/init_lite/services/init/standard/device.c",
"//base/startup/init_lite/services/init/standard/device.c",
"//base/startup/init_lite/services/init/standard/init.c",
"//base/startup/init_lite/services/init/standard/init.c",
"//base/startup/init_lite/services/init/standard/init_cmds.c",
"//base/startup/init_lite/services/init/standard/init_cmds.c",
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录