From: Gao Xiang <hsiangkao@linux.alibaba.com>
Date: Wed, 15 May 2024 17:23:13 +0000 (+0800)
Subject: erofs-utils: pretty root directory progressinfo
X-Git-Tag: v1.8~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f46123601ebaa5d89bc662aa47e9b2d77ab59a8;p=platform%2Fupstream%2Ferofs-utils.git

erofs-utils: pretty root directory progressinfo

Avoid `Processing  ...` or `file  dumped (mode 40755)` messages..

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240515172313.661530-1-hsiangkao@linux.alibaba.com
---

diff --git a/lib/inode.c b/lib/inode.c
index 44d684f..fda98a4 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -1373,10 +1373,11 @@ err_closedir:
 
 static int erofs_mkfs_handle_inode(struct erofs_inode *inode)
 {
+	const char *relpath = erofs_fspath(inode->i_srcpath);
 	char *trimmed;
 	int ret;
 
-	trimmed = erofs_trim_for_progressinfo(erofs_fspath(inode->i_srcpath),
+	trimmed = erofs_trim_for_progressinfo(relpath[0] ? relpath : "/",
 					      sizeof("Processing  ...") - 1);
 	erofs_update_progressinfo("Processing %s ...", trimmed);
 	free(trimmed);
@@ -1410,8 +1411,7 @@ static int erofs_mkfs_handle_inode(struct erofs_inode *inode)
 	} else {
 		ret = erofs_mkfs_handle_directory(inode);
 	}
-	erofs_info("file %s dumped (mode %05o)", erofs_fspath(inode->i_srcpath),
-		   inode->i_mode);
+	erofs_info("file /%s dumped (mode %05o)", relpath, inode->i_mode);
 	return ret;
 }