From: Karel Zak <kzak@redhat.com>
Date: Thu, 31 Oct 2024 10:21:20 +0000 (+0100)
Subject: hardlink: implement --mount
X-Git-Tag: v2.42-start~163^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35b67be1956ee0edbc938eb5971a43712e2a0475;p=thirdparty%2Futil-linux.git

hardlink: implement --mount

Let's export another feature of nftw() to the hardlink command line.
In this case, we will force the file-tree-walk to stay within the same
filesystem.

Addresses: https://github.com/util-linux/util-linux/discussions/3244
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/bash-completion/hardlink b/bash-completion/hardlink
index 22e5b5fa8..926b659ff 100644
--- a/bash-completion/hardlink
+++ b/bash-completion/hardlink
@@ -53,6 +53,7 @@ _hardlink_module()
 			--respect-name
 			--maximize
 			--minimize
+			--mount
 			--dry-run
 			--ignore-owner
 			--keep-oldest
diff --git a/misc-utils/hardlink.1.adoc b/misc-utils/hardlink.1.adoc
index 1a353f06a..192bf9519 100644
--- a/misc-utils/hardlink.1.adoc
+++ b/misc-utils/hardlink.1.adoc
@@ -112,6 +112,9 @@ A regular expression that excludes files from being compared and linked. This op
 *--exclude-subtree* _regex_::
 A regular expression that excludes entire directories from being compared and linked. This option can also be used multiple times.
 
+*--mount*::
+Do not traverse directories on different filesystems (remain within the same filesystem).
+
 *-X*, *--respect-xattrs*::
 Only try to link files with the same extended attributes.
 
diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c
index 55e09265e..2d3861c98 100644
--- a/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@ -195,6 +195,7 @@ static struct options {
 	unsigned int keep_oldest:1;
 	unsigned int prio_trees:1;
 	unsigned int dry_run:1;
+	unsigned int within_mount:1;
 	uintmax_t min_size;
 	uintmax_t max_size;
 	size_t io_size;
@@ -1217,6 +1218,7 @@ static void __attribute__((__noreturn__)) usage(void)
 #ifdef USE_SKIP_SUBTREE
 	fputs(_("     --exclude-subtree <regex>  regular expression to exclude directories\n"), out);
 #endif
+	fputs(_("     --mount                stay within the same filesystem\n"), out);
 #ifdef USE_XATTR
 	fputs(_(" -X, --respect-xattrs       respect extended attributes\n"), out);
 #endif
@@ -1243,7 +1245,8 @@ static int parse_options(int argc, char *argv[])
 	enum {
 		OPT_REFLINK = CHAR_MAX + 1,
 		OPT_SKIP_RELINKS,
-		OPT_EXCLUDE_SUBTREE
+		OPT_EXCLUDE_SUBTREE,
+		OPT_MOUNT
 	};
 	static const char optstr[] = "VhvndfpotXcmMFOx:y:i:r:S:s:b:q";
 	static const struct option long_options[] = {
@@ -1266,6 +1269,7 @@ static int parse_options(int argc, char *argv[])
 #ifdef USE_SKIP_SUBTREE
 		{"exclude-subtree", required_argument, NULL, OPT_EXCLUDE_SUBTREE},
 #endif
+		{"mount", no_argument, NULL, OPT_MOUNT},
 		{"method", required_argument, NULL, 'y' },
 		{"minimum-size", required_argument, NULL, 's'},
 		{"maximum-size", required_argument, NULL, 'S'},
@@ -1379,6 +1383,9 @@ static int parse_options(int argc, char *argv[])
 			reflinks_skip = 1;
 			break;
 #endif
+		case OPT_MOUNT:
+			opts.within_mount = 1;
+			break;
 		case 'h':
 			usage();
 		case 'V':
@@ -1485,11 +1492,14 @@ int main(int argc, char *argv[])
 	stats.started = TRUE;
 
 	ftw_flags = FTW_PHYS;
+
+	if (opts.within_mount)
+		ftw_flags |= FTW_MOUNT;
+
 #ifdef USE_SKIP_SUBTREE
 	if (opts.exclude_subtree)
 		ftw_flags |= FTW_ACTIONRETVAL;
 #endif
-
 	jlog(JLOG_VERBOSE2, _("Scanning [device/inode/links]:"));
 	for (; optind < argc; optind++) {
 		char *path = realpath(argv[optind], NULL);