From d3e64d6e1f905cd67264845c38b38fc6d1bdb088 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 4 Jul 2019 17:07:50 -0400
Subject: Make -mount and -xdev do different things

POSIX now says -mount should skip the whole mount point, while -xdev
should only skip its descendents.

C.f. http://austingroupbugs.net/view.php?id=1133
C.f. https://savannah.gnu.org/bugs/?42318
C.f. https://savannah.gnu.org/bugs/?54745
---
 parse.c | 51 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 13 deletions(-)

(limited to 'parse.c')

diff --git a/parse.c b/parse.c
index fbc987c..70cf13d 100644
--- a/parse.c
+++ b/parse.c
@@ -346,6 +346,10 @@ struct parser_state {
 	const char *depth_arg;
 	/** A "-prune"-type argument if any. */
 	const char *prune_arg;
+	/** A "-mount"-type argument if any. */
+	const char *mount_arg;
+	/** An "-xdev"-type argument if any. */
+	const char *xdev_arg;
 
 	/** The current time. */
 	struct timespec now;
@@ -1546,10 +1550,11 @@ static struct expr *parse_ls(struct parser_state *state, int arg1, int arg2) {
 }
 
 /**
- * Parse -mount, -xdev.
+ * Parse -mount.
  */
 static struct expr *parse_mount(struct parser_state *state, int arg1, int arg2) {
-	state->cmdline->flags |= BFTW_XDEV;
+	state->cmdline->flags |= BFTW_MOUNT;
+	state->mount_arg = state->argv[0];
 	return parse_nullary_option(state);
 }
 
@@ -2408,6 +2413,15 @@ static struct expr *parse_xattr(struct parser_state *state, int arg1, int arg2)
 #endif
 }
 
+/**
+ * Parse -xdev.
+ */
+static struct expr *parse_xdev(struct parser_state *state, int arg1, int arg2) {
+	state->cmdline->flags |= BFTW_XDEV;
+	state->xdev_arg = state->argv[0];
+	return parse_nullary_option(state);
+}
+
 /**
  * Launch a pager for the help output.
  */
@@ -2594,6 +2608,7 @@ static struct expr *parse_help(struct parser_state *state, int arg1, int arg2) {
 	cfprintf(cout, "  ${blu}-mindepth${rs} ${bld}N${rs}\n");
 	cfprintf(cout, "      Ignore files deeper/shallower than ${bld}N${rs}\n");
 	cfprintf(cout, "  ${blu}-mount${rs}\n");
+	cfprintf(cout, "      Skip mount points entirely\n");
 	cfprintf(cout, "  ${blu}-xdev${rs}\n");
 	cfprintf(cout, "      Don't descend into other mount points\n");
 	cfprintf(cout, "  ${blu}-noleaf${rs}\n");
@@ -2888,9 +2903,9 @@ static const struct table_entry parse_table[] = {
 	{"-warn", parse_warn, true},
 	{"-wholename", parse_path, false},
 	{"-writable", parse_access, W_OK},
-	{"-x", parse_mount},
+	{"-x", parse_xdev},
 	{"-xattr", parse_xattr},
-	{"-xdev", parse_mount},
+	{"-xdev", parse_xdev},
 	{"-xtype", parse_type, true},
 	{0},
 };
@@ -3183,17 +3198,23 @@ static struct expr *parse_whole_expr(struct parser_state *state) {
 		}
 	}
 
-	if (state->warn && state->depth_arg && state->prune_arg) {
-		parse_warning(state, "%s does not work in the presence of %s.\n", state->prune_arg, state->depth_arg);
+	if (state->warn) {
+		if (state->mount_arg && state->xdev_arg) {
+			parse_warning(state, "%s is redundant in the presence of %s.\n\n", state->xdev_arg, state->mount_arg);
+		}
+
+		if (state->depth_arg && state->prune_arg) {
+			parse_warning(state, "%s does not work in the presence of %s.\n", state->prune_arg, state->depth_arg);
 
-		if (state->interactive) {
-			fprintf(stderr, "Do you want to continue? ");
-			if (ynprompt() == 0) {
-				goto fail;
+			if (state->interactive) {
+				fprintf(stderr, "Do you want to continue? ");
+				if (ynprompt() == 0) {
+					goto fail;
+				}
 			}
-		}
 
-		fprintf(stderr, "\n");
+			fprintf(stderr, "\n");
+		}
 	}
 
 	return expr;
@@ -3275,8 +3296,10 @@ void dump_cmdline(const struct cmdline *cmdline, bool verbose) {
 	if (cmdline->ignore_races) {
 		cfprintf(cerr, "${blu}-ignore_readdir_race${rs} ");
 	}
-	if (cmdline->flags & BFTW_XDEV) {
+	if (cmdline->flags & BFTW_MOUNT) {
 		cfprintf(cerr, "${blu}-mount${rs} ");
+	} else if (cmdline->flags & BFTW_XDEV) {
+		cfprintf(cerr, "${blu}-xdev{rs} ");
 	}
 	if (cmdline->mindepth != 0) {
 		cfprintf(cerr, "${blu}-mindepth${rs} ${bld}%d${rs} ", cmdline->mindepth);
@@ -3411,6 +3434,8 @@ struct cmdline *parse_cmdline(int argc, char *argv[]) {
 		.last_arg = NULL,
 		.depth_arg = NULL,
 		.prune_arg = NULL,
+		.mount_arg = NULL,
+		.xdev_arg = NULL,
 	};
 
 	if (strcmp(xbasename(state.command), "find") == 0) {
-- 
cgit v1.2.3