From: Karel Zak <kzak@redhat.com>
Date: Thu, 7 Oct 2021 11:11:18 +0000 (+0200)
Subject: hardlink: improve verbose messages
X-Git-Tag: v2.38-rc1~196^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee4c324982cbc73b9f50f5c689f8238a97014cb9;p=thirdparty%2Futil-linux.git

hardlink: improve verbose messages

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c
index a275f2c424..7abec29006 100644
--- a/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@ -570,7 +570,7 @@ static int file_contents_equal(const struct file *a, const struct file *b)
 	assert(a->links != NULL);
 	assert(b->links != NULL);
 
-	jlog(JLOG_VERBOSE1, _("Comparing %s to %s"), a->links->path,
+	jlog(JLOG_VERBOSE2, _("Comparing %s to %s"), a->links->path,
 	     b->links->path);
 
 	stats.comparisons++;
@@ -791,7 +791,8 @@ static int inserter(const char *fpath, const struct stat *sb,
 		return 0;
 	}
 
-	jlog(JLOG_VERBOSE2, _("Visiting %s (file %zu)"), fpath, stats.files);
+	jlog(JLOG_VERBOSE2, " %5zu: [%ld/%ld/%ld] %s",
+			stats.files, sb->st_dev, sb->st_ino, sb->st_nlink, fpath);
 
 	pathlen = strlen(fpath) + 1;
 
@@ -874,6 +875,7 @@ static void visitor(const void *nodep, const VISIT which, const int depth)
 		return;
 
 	for (; master != NULL; master = master->next) {
+
 		if (handle_interrupt())
 			exit(EXIT_FAILURE);
 		if (master->links == NULL)
@@ -1106,6 +1108,7 @@ int main(int argc, char *argv[])
 
 	stats.started = TRUE;
 
+	jlog(JLOG_VERBOSE2, _("Scanning [device/inode/links]:"));
 	for (; optind < argc; optind++) {
 		if (nftw(argv[optind], inserter, 20, FTW_PHYS) == -1)
 			warn(_("cannot process %s"), argv[optind]);