Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
bc9685c1
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
1 年多 前同步成功
通知
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看板
提交
bc9685c1
编写于
3年前
作者:
Z
zhong_ning
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
init : fix code style
Signed-off-by:
N
zhong_ning
<
zhong_ning@hoperun.com
>
上级
4056bc9b
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
17 deletion
+18
-17
services/cmds/reboot/init_cmd_reboot.c
services/cmds/reboot/init_cmd_reboot.c
+6
-4
services/cmds/service_control/service_control.c
services/cmds/service_control/service_control.c
+5
-5
services/src/init_cmds.c
services/src/init_cmds.c
+3
-4
services/src/init_service_manager.c
services/src/init_service_manager.c
+1
-1
services/src/init_service_socket.c
services/src/init_service_socket.c
+2
-2
services/test/unittest/common/cmd_func_test.cpp
services/test/unittest/common/cmd_func_test.cpp
+1
-1
未找到文件。
services/cmds/reboot/init_cmd_reboot.c
浏览文件 @
bc9685c1
...
...
@@ -18,20 +18,22 @@
#include <unistd.h>
#include "init_reboot.h"
#define REBOOT_CMD_NUMBER 2
int
main
(
int
argc
,
char
*
argv
[])
{
if
(
argc
>
2
)
{
if
(
argc
>
REBOOT_CMD_NUMBER
)
{
printf
(
"usage: reboot shutdown
\n
reboot updater
\n
reboot updater[:options]
\n
reboot
\n
"
);
return
0
;
}
if
(
argc
==
2
&&
strcmp
(
argv
[
1
],
"shutdown"
)
!=
0
&&
if
(
argc
==
REBOOT_CMD_NUMBER
&&
strcmp
(
argv
[
1
],
"shutdown"
)
!=
0
&&
strcmp
(
argv
[
1
],
"updater"
)
!=
0
&&
strncmp
(
argv
[
1
],
"updater:"
,
strlen
(
"updater:"
))
!=
0
)
{
strncmp
(
argv
[
1
],
"updater:"
,
strlen
(
"updater:"
))
!=
0
)
{
printf
(
"usage: reboot shutdown
\n
reboot updater
\n
reboot updater[:options]
\n
reboot
\n
"
);
return
0
;
}
int
ret
=
0
;
if
(
argc
==
2
)
{
if
(
argc
==
REBOOT_CMD_NUMBER
)
{
ret
=
DoReboot
(
argv
[
1
]);
}
else
{
ret
=
DoReboot
(
"NoArgument"
);
...
...
This diff is collapsed.
Click to expand it.
services/cmds/service_control/service_control.c
浏览文件 @
bc9685c1
...
...
@@ -15,8 +15,8 @@
#include <string.h>
#include <stdio.h>
#include "sys_param.h"
#include "securec.h"
#include "sys_param.h"
#define SERVICE_START_NUMBER 2
#define SERVICE_CONTROL_NUMBER 3
...
...
@@ -71,13 +71,13 @@ int main(int argc, char** argv)
char
serviceCtl
[
SERVICE_CONTROL_MAX_SIZE
];
if
(
strcmp
(
argv
[
0
],
"start_service"
)
==
0
)
{
if
(
strncpy_s
(
serviceCtl
,
sizeof
(
serviceCtl
),
"ohos.ctl.start"
,
sizeof
(
serviceCtl
)
-
1
)
!=
EOK
)
{
printf
(
"strncpy_s failed.
\n
"
);
return
-
1
;
printf
(
"strncpy_s failed.
\n
"
);
return
-
1
;
}
}
else
if
(
strcmp
(
argv
[
0
],
"stop_service"
)
==
0
)
{
if
(
strncpy_s
(
serviceCtl
,
sizeof
(
serviceCtl
),
"ohos.ctl.stop"
,
sizeof
(
serviceCtl
)
-
1
)
!=
EOK
)
{
printf
(
"strncpy_s failed.
\n
"
);
return
-
1
;
printf
(
"strncpy_s failed.
\n
"
);
return
-
1
;
}
}
else
{
ServiceControl
(
argc
,
argv
);
...
...
This diff is collapsed.
Click to expand it.
services/src/init_cmds.c
浏览文件 @
bc9685c1
...
...
@@ -145,7 +145,7 @@ int GetParamValue(char *symValue, char *paramValue, unsigned int paramLen)
// For ite ohos, do not support parameter operation. just do string copy
inline
int
GetParamValue
(
char
*
symValue
,
char
*
paramValue
,
unsigned
int
paramLen
)
{
return
strncpy_s
(
paramValue
,
paramLen
,
symValue
,
strlen
(
symValue
))
==
EOK
?
0
:
-
1
;
return
(
strncpy_s
(
paramValue
,
paramLen
,
symValue
,
strlen
(
symValue
))
==
EOK
)
?
0
:
-
1
;
}
#endif
...
...
@@ -164,7 +164,6 @@ struct CmdArgs* GetCmd(const char *cmdContent, const char *delim, int argsCount)
char
tmpCmd
[
MAX_BUFFER
];
size_t
cmdLength
=
strlen
(
cmdContent
);
if
(
cmdLength
>
MAX_BUFFER
-
1
)
{
INIT_LOGE
(
"command line is too larget, should not bigger than %d. ignore...
\n
"
,
MAX_BUFFER
);
FreeCmd
(
&
ctx
);
...
...
@@ -201,7 +200,7 @@ struct CmdArgs* GetCmd(const char *cmdContent, const char *delim, int argsCount)
int
index
=
ctx
->
argc
;
while
(
token
!=
NULL
)
{
// Too more arguments, treat rest of data as one argument
if
(
index
==
(
argsCount
-
1
))
{
if
(
index
==
(
argsCount
-
1
))
{
break
;
}
*
token
=
'\0'
;
// replace it with '\0';
...
...
@@ -834,7 +833,7 @@ static void DoSetrlimit(const char *cmdContent)
struct
rlimit
limit
;
limit
.
rlim_cur
=
(
rlim_t
)
atoi
(
ctx
->
argv
[
1
]);
limit
.
rlim_max
=
(
rlim_t
)
atoi
(
ctx
->
argv
[
rlimMaxPos
]);
limit
.
rlim_max
=
(
rlim_t
)
atoi
(
ctx
->
argv
[
rlimMaxPos
]);
int
rcs
=
-
1
;
for
(
unsigned
int
i
=
0
;
i
<
sizeof
(
resource
)
/
sizeof
(
char
*
);
++
i
)
{
if
(
strcmp
(
ctx
->
argv
[
0
],
resource
[
i
])
==
0
)
{
...
...
This diff is collapsed.
Click to expand it.
services/src/init_service_manager.c
浏览文件 @
bc9685c1
...
...
@@ -693,7 +693,7 @@ void ParseAllServices(const cJSON* fileRoot)
tmp
[
i
].
socketCfg
=
NULL
;
}
}
GetServiceOnRestart
(
curItem
,
&
tmp
[
i
]);
(
void
)
GetServiceOnRestart
(
curItem
,
&
tmp
[
i
]);
}
// Increase service counter.
RegisterServices
(
retServices
,
servArrSize
);
...
...
This diff is collapsed.
Click to expand it.
services/src/init_service_socket.c
浏览文件 @
bc9685c1
...
...
@@ -50,7 +50,7 @@ static int CreateSocket(struct ServiceSocket *sockopt)
bzero
(
&
addr
,
sizeof
(
addr
));
addr
.
sun_family
=
AF_UNIX
;
if
(
snprintf_s
(
addr
.
sun_path
,
sizeof
(
addr
.
sun_path
),
sizeof
(
addr
.
sun_path
)
-
1
,
HOS_SOCKET_DIR
"/%s"
,
sockopt
->
name
)
<
0
)
{
sockopt
->
name
)
<
0
)
{
return
-
1
;
}
if
(
access
(
addr
.
sun_path
,
F_OK
))
{
...
...
@@ -100,7 +100,7 @@ static int SetSocketEnv(int fd, char *name)
char
pubName
[
MAX_SOCKET_ENV_PREFIX_LEN
]
=
{
0
};
char
val
[
MAX_SOCKET_FD_LEN
]
=
{
0
};
if
(
snprintf_s
(
pubName
,
MAX_SOCKET_ENV_PREFIX_LEN
,
MAX_SOCKET_ENV_PREFIX_LEN
-
1
,
HOS_SOCKET_ENV_PREFIX
"%s"
,
name
)
<
0
)
{
HOS_SOCKET_ENV_PREFIX
"%s"
,
name
)
<
0
)
{
return
-
1
;
}
if
(
snprintf_s
(
val
,
MAX_SOCKET_FD_LEN
,
MAX_SOCKET_FD_LEN
-
1
,
"%d"
,
fd
)
<
0
)
{
...
...
This diff is collapsed.
Click to expand it.
services/test/unittest/common/cmd_func_test.cpp
浏览文件 @
bc9685c1
...
...
@@ -522,7 +522,7 @@ static char* ReadFileToBuf()
break
;
}
buffer
=
(
char
*
)
malloc
((
size_t
)
fileStat
.
st_size
+
1
);
buffer
=
static_cast
<
char
*>
malloc
((
size_t
)
fileStat
.
st_size
+
1
);
if
(
buffer
==
nullptr
)
{
break
;
}
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部