Skip to content

Commit

Permalink
Merge branch 'PR/findmnt-Q-tree' of github.com:karelzak/util-linux-work
Browse files Browse the repository at this point in the history 
* 'PR/findmnt-Q-tree' of github.com:karelzak/util-linux-work:
  tests: update findmnt -Q tests
  findmnt: improve -Q to output tree
  • Loading branch information
@karelzak
karelzak committed Aug 27, 2024
2 parents ca79329 + e6aacb8 commit 25c6fc9
Show file tree
Hide file tree
Showing 9 changed files with 114 additions and 111 deletions.
7 changes: 5 additions & 2 deletions misc-utils/findmnt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,8 +962,12 @@ static int create_treenode(struct libscols_table *table, struct libmnt_table *tb

if ((findmnt->flags & FL_SUBMOUNTS) || match_func(fs, findmnt)) {
bool filtered = false;
if (has_line(table, fs))
goto leave;
line = add_line(table, fs, parent_line, findmnt, &filtered);
if (!line || filtered)
if (filtered)
line = parent_line;
else if (!line)
goto leave;
} else
line = parent_line;
Expand Down Expand Up @@ -1848,7 +1852,6 @@ int main(int argc, char *argv[])
break;
case 'Q':
findmnt.filter = new_filter(optarg);
findmnt.flags &= ~FL_TREE;
break;
case 'm': /* mtab */
tabtype = TABTYPE_MTAB;
Expand Down
60 changes: 30 additions & 30 deletions tests/expected/findmnt/filterQ-options
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
TARGET SOURCE FSTYPE OPTIONS
/proc /proc proc rw,relatime
/sys /sys sysfs rw,relatime
/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755
/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000
/dev/shm tmpfs tmpfs rw,relatime
/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755
/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset
/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns
/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu
/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct
/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory
/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices
/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer
/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls
/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio
/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/proc/bus/usb /proc/bus/usb usbfs rw,relatime
/dev/hugepages hugetlbfs hugetlbfs rw,relatime
/dev/mqueue mqueue mqueue rw,relatime
/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime
/sys/fs/fuse/connections fusectl fusectl rw,relatime
/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime
/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
TARGET SOURCE FSTYPE OPTIONS
/proc /proc proc rw,relatime
|-/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
| `-/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime
`-/proc/bus/usb /proc/bus/usb usbfs rw,relatime
/sys /sys sysfs rw,relatime
|-/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755
| |-/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
| |-/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset
| |-/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns
| |-/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu
| |-/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct
| |-/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory
| |-/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices
| |-/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer
| |-/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls
| `-/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio
|-/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
|-/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
`-/sys/fs/fuse/connections fusectl fusectl rw,relatime
/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755
|-/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000
|-/dev/shm tmpfs tmpfs rw,relatime
|-/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
| `-/dev/hugepages hugetlbfs hugetlbfs rw,relatime
`-/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
`-/dev/mqueue mqueue mqueue rw,relatime
/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime
/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
rc=0
4 changes: 2 additions & 2 deletions tests/expected/findmnt/filterQ-options-name
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TARGET SOURCE FSTYPE OPTIONS
/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
rc=0
64 changes: 32 additions & 32 deletions tests/expected/findmnt/filterQ-options-nameval-neg
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
TARGET SOURCE FSTYPE OPTIONS
/proc /proc proc rw,relatime
/sys /sys sysfs rw,relatime
/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755
/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000
/dev/shm tmpfs tmpfs rw,relatime
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755
/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset
/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns
/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu
/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct
/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory
/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices
/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer
/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls
/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio
/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
/proc/bus/usb /proc/bus/usb usbfs rw,relatime
/dev/hugepages hugetlbfs hugetlbfs rw,relatime
/dev/mqueue mqueue mqueue rw,relatime
/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime
/sys/fs/fuse/connections fusectl fusectl rw,relatime
/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime
/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
|-/proc /proc proc rw,relatime
| |-/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
| | `-/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime
| `-/proc/bus/usb /proc/bus/usb usbfs rw,relatime
|-/sys /sys sysfs rw,relatime
| |-/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755
| | |-/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
| | |-/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset
| | |-/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns
| | |-/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu
| | |-/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct
| | |-/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory
| | |-/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices
| | |-/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer
| | |-/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls
| | `-/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio
| |-/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
| `-/sys/fs/fuse/connections fusectl fusectl rw,relatime
|-/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755
| |-/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000
| |-/dev/shm tmpfs tmpfs rw,relatime
| |-/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
| | `-/dev/hugepages hugetlbfs hugetlbfs rw,relatime
| `-/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
| `-/dev/mqueue mqueue mqueue rw,relatime
|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
|-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
| `-/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
|-/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime
`-/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
rc=0
8 changes: 4 additions & 4 deletions tests/expected/findmnt/filterQ-options-neg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
`-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
rc=0
8 changes: 4 additions & 4 deletions tests/expected/findmnt/filterQ-options-no
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
`-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
rc=0
6 changes: 3 additions & 3 deletions tests/expected/findmnt/filterQ-types
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
`-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
rc=0
8 changes: 4 additions & 4 deletions tests/expected/findmnt/filterQ-types-multi
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
TARGET SOURCE FSTYPE OPTIONS
/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered
`-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered
rc=0
Loading

0 comments on commit 25c6fc9

Please sign in to comment.