提交 92b81e46 编写于 作者: S sun_fan

init: fix codedex

Signed-off-by: Nsun_fan <sun_fan1@hoperun.com>
上级 36cc28db
...@@ -380,7 +380,6 @@ static void DoReset(const char *cmdContent, int maxArg) ...@@ -380,7 +380,6 @@ static void DoReset(const char *cmdContent, int maxArg)
static void DoCopyInernal(const char *source, const char *target) static void DoCopyInernal(const char *source, const char *target)
{ {
bool isSuccess = true;
if (source == NULL || target == NULL) { if (source == NULL || target == NULL) {
INIT_LOGE("Copy file with invalid arguments"); INIT_LOGE("Copy file with invalid arguments");
return; return;
...@@ -403,6 +402,7 @@ static void DoCopyInernal(const char *source, const char *target) ...@@ -403,6 +402,7 @@ static void DoCopyInernal(const char *source, const char *target)
if (dstFd >= 0) { if (dstFd >= 0) {
char buf[MAX_COPY_BUF_SIZE] = {0}; char buf[MAX_COPY_BUF_SIZE] = {0};
ssize_t readn = -1; ssize_t readn = -1;
bool isSuccess = true;
while ((readn = read(srcFd, buf, MAX_COPY_BUF_SIZE - 1)) > 0) { while ((readn = read(srcFd, buf, MAX_COPY_BUF_SIZE - 1)) > 0) {
ssize_t writen = WriteAll(dstFd, buf, (size_t)readn); ssize_t writen = WriteAll(dstFd, buf, (size_t)readn);
if (writen != readn) { if (writen != readn) {
...@@ -410,17 +410,16 @@ static void DoCopyInernal(const char *source, const char *target) ...@@ -410,17 +410,16 @@ static void DoCopyInernal(const char *source, const char *target)
break; break;
} }
} }
} if (!isSuccess) {
INIT_LOGE("Copy from \" %s \" to \" %s \" failed", source, target);
if (!isSuccess) { } else {
INIT_LOGE("Copy from \" %s \" to \" %s \" failed", source, target); fsync(dstFd);
} else { }
fsync(dstFd); close(dstFd);
dstFd = -1;
} }
close(srcFd); close(srcFd);
close(dstFd);
srcFd = -1; srcFd = -1;
dstFd = -1;
} }
static void DoCopy(const char *cmdContent, int maxArg) static void DoCopy(const char *cmdContent, int maxArg)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册