From 7d66388467986ae74a4f528bbed4bb23aa79d32e Mon Sep 17 00:00:00 2001 From: haozi007 Date: Wed, 22 Jul 2020 17:41:30 +0800 Subject: [PATCH] improve readline util Signed-off-by: haozi007 --- src/utils/cutils/utils_file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/utils/cutils/utils_file.c b/src/utils/cutils/utils_file.c index 2aac013..43c0005 100644 --- a/src/utils/cutils/utils_file.c +++ b/src/utils/cutils/utils_file.c @@ -1466,15 +1466,16 @@ int isula_utils_read_line(FILE *fp, read_line_callback_t cb, void *context) nret = getline(&line, &len, fp); if (nret == -1) { // end of file - ret = (errno == 0 ? 0 : -1); - if (ret != 0) { - ERROR("error read line from tar split: %s", strerror(errno)); + if (errno != 0) { + ret = -1; + ERROR("read line failed: %s", strerror(errno)); } goto out; } util_trim_newline(line); if (!cb(line, context)) { + ret = -1; goto out; } } -- GitLab