From a1636c9dfb3d8f7639635d0a85a0066b522638c4 Mon Sep 17 00:00:00 2001 From: sun_fan Date: Tue, 14 Sep 2021 19:21:50 +0800 Subject: [PATCH] init: fix test fail Signed-off-by: sun_fan --- services/src/init_cmds.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/services/src/init_cmds.c b/services/src/init_cmds.c index 9b57d4e6..e0791076 100644 --- a/services/src/init_cmds.c +++ b/services/src/init_cmds.c @@ -515,9 +515,10 @@ static void DoMkDir(const char *cmdContent, int maxArg) FreeCmd(ctx); return; } + int rc = -1; do { int index = 0; - int rc = mkdir(ctx->argv[index], DEFAULT_DIR_MODE); + rc = mkdir(ctx->argv[index], DEFAULT_DIR_MODE); if (rc < 0) { if (errno == EEXIST) { INIT_LOGE("Path \" %s \" already exist", ctx->argv[0]); @@ -539,14 +540,14 @@ static void DoMkDir(const char *cmdContent, int maxArg) rc = -1; } } - if (rc < 0) { - INIT_LOGE("Run command mkdir failed, unlink path"); - if (unlink(ctx->argv[0]) < 0) { - INIT_LOGE("Failed unlink %s errno %d ", ctx->argv[0], errno); - } - } } while (0); + if (rc < 0) { + INIT_LOGE("Run command mkdir failed, rmdir path"); + if (rmdir(ctx->argv[0]) < 0) { + INIT_LOGE("Failed rmdir %s errno %d ", ctx->argv[0], errno); + } + } FreeCmd(ctx); } -- GitLab