openharmony/startup_init_lite
1
0
Fork 0
mirror of https://github.com/openharmony/startup_init_lite.git synced 2026-07-19 17:07:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

init: fix bugs

Browse Source 
Signed-off-by: sun_fan <sun_fan1@hoperun.com>
This commit is contained in:
sun_fan
2021-09-18 15:31:36 +08:00
parent 97a44a68ef
commit 3289284c5a
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/init_cmds.c
+6 -10
View File
@@ -205,7 +205,6 @@ static bool IsArgsExpected(const struct CmdArgs *ctx, int expectedArgCount)
static void DoCopyInernal(const char *source, const char *target)
{
bool isSuccess = true;
if (source == NULL || target == NULL) {
INIT_LOGE("Copy file with invalid arguments");
return;
@@ -215,7 +214,6 @@ static void DoCopyInernal(const char *source, const char *target)
int srcFd = open(source, O_RDONLY);
if (srcFd < 0) {
INIT_LOGE("Open \" %s \" failed, err = %d", source, errno);
srcFd = -1;
return;
}
@@ -228,6 +226,7 @@ static void DoCopyInernal(const char *source, const char *target)
int dstFd = open(target, O_WRONLY | O_TRUNC | O_CREAT, st.st_mode);
if (dstFd >= 0) {
char buf[MAX_COPY_BUF_SIZE] = {0};
bool isSuccess = true;
ssize_t readn = -1;
ssize_t writen = -1;
while ((readn = read(srcFd, buf, MAX_COPY_BUF_SIZE - 1)) > 0) {
@@ -237,19 +236,16 @@ static void DoCopyInernal(const char *source, const char *target)
break;
}
}
if (!isSuccess) {
if (isSuccess == false) {
INIT_LOGE("Copy from \" %s \" to \" %s \" failed", source, target);
} else {
fsync(dstFd);
}
fsync(dstFd);
}
if (srcFd >= 0) {
close(srcFd);
srcFd = -1;
}
if (dstFd >= 0) {
close(dstFd);
dstFd = -1;
}
close(srcFd);
srcFd = -1;
}
static void DoCopy(const char* cmdContent)