erofs-utils: pretty root directory progressinfo
authorGao Xiang <hsiangkao@linux.alibaba.com>
Wed, 15 May 2024 17:23:13 +0000 (01:23 +0800)
committerGao Xiang <hsiangkao@linux.alibaba.com>
Thu, 16 May 2024 16:32:22 +0000 (00:32 +0800)
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
lib/inode.c

index 44d684f9678a64220050fbfc458c1b63189fedeb..fda98a48d7f145cc382cd1c443ff55bbae40b068 100644 (file)
@@ -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;
 }