aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/zfs
diff options
context:
space:
mode:
authorнаб <[email protected]>2021-12-10 00:02:52 +0100
committerBrian Behlendorf <[email protected]>2021-12-13 15:49:40 -0800
commit344bbc82e7054f61d5e7b3610b119820285fd2cb (patch)
treea0ac59fe3b3d2c64d5f8495f035e3563d0413f6c /cmd/zfs
parentf04b97620059d08b37d9e80ada397e742bb2f311 (diff)
zfs, libzfs: diff: accept -h/ZFS_DIFF_NO_MANGLE, disabling path escaping
Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Rich Ercolani <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12829
Diffstat (limited to 'cmd/zfs')
-rw-r--r--cmd/zfs/zfs_main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index c43951d82..d5d181768 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -7664,7 +7664,7 @@ zfs_do_diff(int argc, char **argv)
int c;
struct sigaction sa;
- while ((c = getopt(argc, argv, "FHt")) != -1) {
+ while ((c = getopt(argc, argv, "FHth")) != -1) {
switch (c) {
case 'F':
flags |= ZFS_DIFF_CLASSIFY;
@@ -7675,6 +7675,9 @@ zfs_do_diff(int argc, char **argv)
case 't':
flags |= ZFS_DIFF_TIMESTAMP;
break;
+ case 'h':
+ flags |= ZFS_DIFF_NO_MANGLE;
+ break;
default:
(void) fprintf(stderr,
gettext("invalid option '%c'\n"), optopt);