diff options
| author | Tavian Barnes <tavianator@tavianator.com> | 2024-07-08 13:15:37 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@tavianator.com> | 2024-07-08 13:15:37 -0400 |
| commit | 33b85e1f8769e7f75721887638ae454d109a034f (patch) | |
| tree | aa4831407cdc1466c4071d0691941b96f81bd2a3 | |
| parent | 0ad75059c70488e9802d716c9e2dc04ad7b1ea5a (diff) | |
| download | bfs-33b85e1f8769e7f75721887638ae454d109a034f.tar.xz | |
Implement POSIX 2024's -mount
This reverts commit 4f80c17192f2b28c96a489969d4435151d68d0ce.
Link: https://www.austingroupbugs.net/view.php?id=1133
| -rw-r--r-- | src/parse.c | 5 | ||||
| -rw-r--r-- | tests/common/L_mount.out | 5 | ||||
| -rw-r--r-- | tests/posix/L_mount.out | 2 | ||||
| -rw-r--r-- | tests/posix/L_mount.sh (renamed from tests/common/L_mount.sh) | 0 | ||||
| -rw-r--r-- | tests/posix/mount.out (renamed from tests/common/mount.out) | 1 | ||||
| -rw-r--r-- | tests/posix/mount.sh (renamed from tests/common/mount.sh) | 0 |
6 files changed, 3 insertions, 10 deletions
diff --git a/src/parse.c b/src/parse.c index 86ce72c..c225778 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1694,10 +1694,7 @@ static struct bfs_expr *parse_mount(struct bfs_parser *parser, int arg1, int arg return NULL; } - parse_expr_warning(parser, expr, "In the future, ${blu}%s${rs} will skip mount points entirely, unlike\n", expr->argv[0]); - bfs_warning(parser->ctx, "${blu}-xdev${rs}, due to http://austingroupbugs.net/view.php?id=1133.\n\n"); - - parser->ctx->flags |= BFTW_PRUNE_MOUNTS; + parser->ctx->flags |= BFTW_SKIP_MOUNTS; parser->mount_arg = expr->argv; return expr; } diff --git a/tests/common/L_mount.out b/tests/common/L_mount.out deleted file mode 100644 index 788579d..0000000 --- a/tests/common/L_mount.out +++ /dev/null @@ -1,5 +0,0 @@ -. -./foo -./foo/bar -./foo/qux -./mnt diff --git a/tests/posix/L_mount.out b/tests/posix/L_mount.out new file mode 100644 index 0000000..7ed5f0d --- /dev/null +++ b/tests/posix/L_mount.out @@ -0,0 +1,2 @@ +. +./foo diff --git a/tests/common/L_mount.sh b/tests/posix/L_mount.sh index fd8042a..fd8042a 100644 --- a/tests/common/L_mount.sh +++ b/tests/posix/L_mount.sh diff --git a/tests/common/mount.out b/tests/posix/mount.out index 6253434..b0ad937 100644 --- a/tests/common/mount.out +++ b/tests/posix/mount.out @@ -1,4 +1,3 @@ . ./foo ./foo/bar -./mnt diff --git a/tests/common/mount.sh b/tests/posix/mount.sh index c9abde5..c9abde5 100644 --- a/tests/common/mount.sh +++ b/tests/posix/mount.sh |