diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2023-07-17 21:26:45 +0200 |
|---|---|---|
| committer | Thomas Weißschuh <thomas@t-8ch.de> | 2023-07-17 23:19:35 +0200 |
| commit | 58a8c9284d625347db86970af90a88f5d6c9f7cd (patch) | |
| tree | 151dc9066fad7304682b948b6b667b54d77368cb | |
| parent | baef265925b2745d0ff8cfd5c8f77de89b0b87fb (diff) | |
| download | util-linux-58a8c9284d625347db86970af90a88f5d6c9f7cd.tar.gz | |
libsmartcols: don't include hidden headers in column width calculation
Fixes #2380
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
57 files changed, 214 insertions, 200 deletions
diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c index ad0b15d92d..cb7e020386 100644 --- a/libsmartcols/src/calculate.c +++ b/libsmartcols/src/calculate.c @@ -175,8 +175,9 @@ static int count_column_width(struct libscols_table *tb, } /* set minimal width according to header width */ - data = scols_cell_get_data(&cl->header); - if (data) { + if (!scols_table_is_noheadings(tb) && + (data = scols_cell_get_data(&cl->header))) { + size_t len = scols_table_is_noencoding(tb) ? mbs_width(data) : mbs_safe_width(data); diff --git a/tests/expected/column/table-noheaders b/tests/expected/column/table-noheaders new file mode 100644 index 0000000000..5fc905dfe2 --- /dev/null +++ b/tests/expected/column/table-noheaders @@ -0,0 +1,6 @@ +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD diff --git a/tests/expected/fincore/count.4096 b/tests/expected/fincore/count.4096 index e90044c132..a5d764f581 100644 --- a/tests/expected/fincore/count.4096 +++ b/tests/expected/fincore/count.4096 @@ -1,36 +1,36 @@ [ NO EXCITING FILE ] return value: 1 - 0 0 i_EMPTY_FILE +0 0 i_EMPTY_FILE return value: 0 - 1 4095 i_PAGESIZE_-1__incore_ +1 4095 i_PAGESIZE_-1__incore_ return value: 0 - 1 4096 i_JUST_PAGESIZE_incore_ +1 4096 i_JUST_PAGESIZE_incore_ return value: 0 - 0 4096 i_JUST_PAGESIZE_directio_ +0 4096 i_JUST_PAGESIZE_directio_ return value: 0 - 2 8192 i_TWO_PAGES_incore_ +2 8192 i_TWO_PAGES_incore_ return value: 0 - 0 8192 i_TWO_PAGES_directio_ +0 8192 i_TWO_PAGES_directio_ return value: 0 - 1 8192 i_TWO_PAGES_mixed_directio_incore_ +1 8192 i_TWO_PAGES_mixed_directio_incore_ return value: 0 - 1 8192 i_TWO_PAGES_mixed_incore_directio_ +1 8192 i_TWO_PAGES_mixed_incore_directio_ return value: 0 - 2 134213632 i_WINDOW_SIZE_incore-sparse-incore_ +2 134213632 i_WINDOW_SIZE_incore-sparse-incore_ return value: 0 - 0 134213632 i_WINDOW_SIZE_directio-sparse-directio_ +0 134213632 i_WINDOW_SIZE_directio-sparse-directio_ return value: 0 - 1 134213632 i_WINDOW_SIZE_incore-sparse-directio_ +1 134213632 i_WINDOW_SIZE_incore-sparse-directio_ return value: 0 - 1 134213632 i_WINDOW_SIZE_directio-sparse-incore_ +1 134213632 i_WINDOW_SIZE_directio-sparse-incore_ return value: 0 - 2 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-incore_ +2 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-incore_ return value: 0 - 0 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-directio_ +0 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-directio_ return value: 0 - 1 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-directio_ +1 134217728 i_WINDOW_SIZE_+_1_page_incore-sparse-directio_ return value: 0 - 1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_ +1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_ return value: 0 [ MULTIPLE FILES ] PAGES SIZE FILE diff --git a/tests/expected/lsfd/column-ainodeclass-inotify b/tests/expected/lsfd/column-ainodeclass-inotify index f93e19e1f8..b1561dd2c8 100644 --- a/tests/expected/lsfd/column-ainodeclass-inotify +++ b/tests/expected/lsfd/column-ainodeclass-inotify @@ -1,2 +1,2 @@ - 3 UNKN inotify +3 UNKN inotify inotify:ASSOC,STTYPE,AINODECLASS: 0 diff --git a/tests/expected/lsfd/column-ainodeclass-pidfd b/tests/expected/lsfd/column-ainodeclass-pidfd index 269cea5d93..5fe751ce40 100644 --- a/tests/expected/lsfd/column-ainodeclass-pidfd +++ b/tests/expected/lsfd/column-ainodeclass-pidfd @@ -1,2 +1,2 @@ - 3 UNKN pidfd +3 UNKN pidfd pidfd:ASSOC,STTYPE,AINODECLASS: 0 diff --git a/tests/expected/lsfd/column-deleted-make-regular-file b/tests/expected/lsfd/column-deleted-make-regular-file index 97cab8470e..86e46bca6d 100644 --- a/tests/expected/lsfd/column-deleted-make-regular-file +++ b/tests/expected/lsfd/column-deleted-make-regular-file @@ -1,2 +1,2 @@ - 1 +1 make-regular-file: DELETED: 0 diff --git a/tests/expected/lsfd/column-deleted-ro-regular-file b/tests/expected/lsfd/column-deleted-ro-regular-file index 878b621e9b..ccaf14e49e 100644 --- a/tests/expected/lsfd/column-deleted-ro-regular-file +++ b/tests/expected/lsfd/column-deleted-ro-regular-file @@ -1,2 +1,2 @@ - 0 +0 ro-regular-file: DELETED: 0 diff --git a/tests/expected/lsfd/column-name-pidfd b/tests/expected/lsfd/column-name-pidfd index 49abe81747..10e3c5e7f5 100644 --- a/tests/expected/lsfd/column-name-pidfd +++ b/tests/expected/lsfd/column-name-pidfd @@ -1,2 +1,2 @@ - 3 anon_inode:[pidfd] pid=1 comm= nspid=1 +3 anon_inode:[pidfd] pid=1 comm= nspid=1 pidfd:ASSOC,KNAME,NAME: 0 diff --git a/tests/expected/lsfd/column-name-ro-regular-file b/tests/expected/lsfd/column-name-ro-regular-file index 446a916448..e7fc7c637b 100644 --- a/tests/expected/lsfd/column-name-ro-regular-file +++ b/tests/expected/lsfd/column-name-ro-regular-file @@ -1,2 +1,2 @@ - 3 /etc/passwd /etc/passwd +3 /etc/passwd /etc/passwd ro-regular-file:ASSOC,KNAME,NAME: 0 diff --git a/tests/expected/lsfd/column-name-socketpair b/tests/expected/lsfd/column-name-socketpair index bd94e567f0..b4aaf7b5fa 100644 --- a/tests/expected/lsfd/column-name-socketpair +++ b/tests/expected/lsfd/column-name-socketpair @@ -1,2 +1,2 @@ - 3 socket:[INODENUM] state=connected type=dgram +3 socket:[INODENUM] state=connected type=dgram socketpair:ASSOC,KNAME,NAME: 0 diff --git a/tests/expected/lsfd/column-source-namespace-ASSOC b/tests/expected/lsfd/column-source-namespace-ASSOC index 8b26e3251d..e6ed958fcf 100644 --- a/tests/expected/lsfd/column-source-namespace-ASSOC +++ b/tests/expected/lsfd/column-source-namespace-ASSOC @@ -1,7 +1,7 @@ - ipc nsfs - mnt nsfs - net nsfs - pid nsfs -pid4c nsfs - user nsfs - uts nsfs + ipc nsfs + mnt nsfs + net nsfs + pid nsfs +pid4c nsfs + user nsfs + uts nsfs diff --git a/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem b/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem index 39e4ce24b5..db40d92556 100644 --- a/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem +++ b/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem @@ -1,2 +1,2 @@ - shm tmpfs +shm tmpfs ASSOC,SOURCE: 0 diff --git a/tests/expected/lsfd/column-type-inotify b/tests/expected/lsfd/column-type-inotify index 69588d96cd..15363f5761 100644 --- a/tests/expected/lsfd/column-type-inotify +++ b/tests/expected/lsfd/column-type-inotify @@ -1,2 +1,2 @@ - 3 UNKN inotify +3 UNKN inotify inotify:ASSOC,STTYPE,TYPE: 0 diff --git a/tests/expected/lsfd/column-type-pidfd b/tests/expected/lsfd/column-type-pidfd index a3278d2cd0..6c9a9632ea 100644 --- a/tests/expected/lsfd/column-type-pidfd +++ b/tests/expected/lsfd/column-type-pidfd @@ -1,2 +1,2 @@ - 3 UNKN pidfd +3 UNKN pidfd pidfd:ASSOC,STTYPE,TYPE: 0 diff --git a/tests/expected/lsfd/column-type-ro-regular-file b/tests/expected/lsfd/column-type-ro-regular-file index 63b435600e..7028264da2 100644 --- a/tests/expected/lsfd/column-type-ro-regular-file +++ b/tests/expected/lsfd/column-type-ro-regular-file @@ -1,2 +1,2 @@ - 3 REG REG +3 REG REG ro-regular-file:ASSOC,STTYPE,TYPE: 0 diff --git a/tests/expected/lsfd/column-type-socketpair b/tests/expected/lsfd/column-type-socketpair index 22a61b78c4..ec00f65647 100644 --- a/tests/expected/lsfd/column-type-socketpair +++ b/tests/expected/lsfd/column-type-socketpair @@ -1,2 +1,2 @@ - 3 SOCK UNIX +3 SOCK UNIX socketpair:ASSOC,STTYPE,TYPE: 0 diff --git a/tests/expected/lsfd/column-xmode-MODE-r-bit b/tests/expected/lsfd/column-xmode-MODE-r-bit index 7f5a23d621..05b2dd1e4d 100644 --- a/tests/expected/lsfd/column-xmode-MODE-r-bit +++ b/tests/expected/lsfd/column-xmode-MODE-r-bit @@ -1,2 +1,2 @@ - r-- +r-- MODE(r-bit): 0 diff --git a/tests/expected/lsfd/column-xmode-MODE-w-bit b/tests/expected/lsfd/column-xmode-MODE-w-bit index 13b77f6c47..bd0cca6c9a 100644 --- a/tests/expected/lsfd/column-xmode-MODE-w-bit +++ b/tests/expected/lsfd/column-xmode-MODE-w-bit @@ -1,2 +1,2 @@ - -w- +-w- MODE(w-bit): 0 diff --git a/tests/expected/lsfd/column-xmode-MODE-x-bit b/tests/expected/lsfd/column-xmode-MODE-x-bit index e5474b0e7d..8ab32fd442 100644 --- a/tests/expected/lsfd/column-xmode-MODE-x-bit +++ b/tests/expected/lsfd/column-xmode-MODE-x-bit @@ -1,2 +1,2 @@ - r-x +r-x MODE(x-bit): 0 diff --git a/tests/expected/lsfd/filter-floating-point-nums b/tests/expected/lsfd/filter-floating-point-nums index 7c971d6227..60d87a9b44 100644 --- a/tests/expected/lsfd/filter-floating-point-nums +++ b/tests/expected/lsfd/filter-floating-point-nums @@ -1,15 +1,15 @@ pid in a range: 0 coparing pids: 0 - 3 10.000050000 +3 10.000050000 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10.000051) and (TIMERFD.INTERVAL > 10): 0 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL <= 10) and (TIMERFD.INTERVAL > 9.99): 0 - 3 10.000050000 +3 10.000050000 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL >= 10): 0 - 3 10.000050000 +3 10.000050000 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL >= 10.0): 0 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10) and (0 < TIMERFD.INTERVAL): 0 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10) and (0.0 < TIMERFD.INTERVAL): 0 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL > 11): 0 - 3 10.000050000 +3 10.000050000 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL == 10.00005): 0 FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL == 10.000051): 0 diff --git a/tests/expected/lsfd/mkfds-cdev-tun b/tests/expected/lsfd/mkfds-cdev-tun index 6bef3aec1e..5217d7939a 100644 --- a/tests/expected/lsfd/mkfds-cdev-tun +++ b/tests/expected/lsfd/mkfds-cdev-tun @@ -1,4 +1,4 @@ - 3 rw- CHR misc:tun +3 rw- CHR misc:tun ASSOC,MODE,TYPE,SOURCE: 0 NAME: 0 TUN.IFACE: 0 diff --git a/tests/expected/lsfd/mkfds-directory b/tests/expected/lsfd/mkfds-directory index fd7f2935cc..62c9d5ced0 100644 --- a/tests/expected/lsfd/mkfds-directory +++ b/tests/expected/lsfd/mkfds-directory @@ -1,4 +1,4 @@ - 3 r-- DIR directory / +3 r-- DIR directory / ASSOC,MODE,TYPE,FLAGS,NAME: 0 PID[RUN]: 0 PID[STR]: 0 diff --git a/tests/expected/lsfd/mkfds-eventfd b/tests/expected/lsfd/mkfds-eventfd index 70519bd4d6..d99157e3cf 100644 --- a/tests/expected/lsfd/mkfds-eventfd +++ b/tests/expected/lsfd/mkfds-eventfd @@ -1,8 +1,8 @@ - 3 rw- eventfd anon_inodefs +3 rw- eventfd anon_inodefs parent: ASSOC,MODE,TYPE,SOURCE: 0 parent: NAME: 0 parent: ID: 0 - 4 rw- eventfd anon_inodefs +4 rw- eventfd anon_inodefs child: ASSOC,MODE,TYPE,SOURCE: 0 child: NAME: 0 child: ID: 0 diff --git a/tests/expected/lsfd/mkfds-eventpoll b/tests/expected/lsfd/mkfds-eventpoll index 8f035ffba2..d494fb4836 100644 --- a/tests/expected/lsfd/mkfds-eventpoll +++ b/tests/expected/lsfd/mkfds-eventpoll @@ -1,5 +1,5 @@ - 3 eventpoll tfds=5,7 5 - 7 +3 eventpoll tfds=5,7 5 + 7 ASSOC,TYPE,NAME,EVENTPOLL.TFDS: 0 { "lsfd": [ diff --git a/tests/expected/lsfd/mkfds-mapped-packet-socket b/tests/expected/lsfd/mkfds-mapped-packet-socket index 7c1b5037d0..ec8795b700 100644 --- a/tests/expected/lsfd/mkfds-mapped-packet-socket +++ b/tests/expected/lsfd/mkfds-mapped-packet-socket @@ -1,8 +1,8 @@ - PACKET +PACKET SOCK.PROTONAME: 0 -type=raw protocol=all iface=lo raw PACKET lo all +type=raw protocol=all iface=lo raw PACKET lo all NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0 - PACKET +PACKET SOCK.PROTONAME: 0 -type=dgram protocol=all iface=lo dgram PACKET lo all +type=dgram protocol=all iface=lo dgram PACKET lo all NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0 diff --git a/tests/expected/lsfd/mkfds-mqueue b/tests/expected/lsfd/mkfds-mqueue index fda65c471e..b08de13139 100644 --- a/tests/expected/lsfd/mkfds-mqueue +++ b/tests/expected/lsfd/mkfds-mqueue @@ -1,7 +1,7 @@ - 3 r-- mqueue mqueue /mkfds-mqueue +3 r-- mqueue mqueue /mkfds-mqueue parent: ASSOC,MODE,TYPE,SOURCE,NAME: 0 parent: INODE: 0 - 4 -w- mqueue mqueue +4 -w- mqueue mqueue child: ASSOC,MODE,TYPE,SOURCE: 0 child: INODE: 0 INODE[STR]: 0 diff --git a/tests/expected/lsfd/mkfds-netlink-groups b/tests/expected/lsfd/mkfds-netlink-groups index ad50da1d38..e78c8ebcee 100644 --- a/tests/expected/lsfd/mkfds-netlink-groups +++ b/tests/expected/lsfd/mkfds-netlink-groups @@ -1,3 +1,3 @@ - 3 NETLINK protocol=sock_diag lport= groups=5 raw sock_diag 5 +3 NETLINK protocol=sock_diag lport= groups=5 raw sock_diag 5 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,NETLINK.PROTOCOL,NETLINK.GROUPS: 0 LPORT: OK diff --git a/tests/expected/lsfd/mkfds-netlink-protocol b/tests/expected/lsfd/mkfds-netlink-protocol index df3dce7f8e..77c4e1f480 100644 --- a/tests/expected/lsfd/mkfds-netlink-protocol +++ b/tests/expected/lsfd/mkfds-netlink-protocol @@ -1,3 +1,3 @@ - 3 NETLINK protocol=sock_diag lport= raw sock_diag 0 +3 NETLINK protocol=sock_diag lport= raw sock_diag 0 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,NETLINK.PROTOCOL: 0 LPORT: OK diff --git a/tests/expected/lsfd/mkfds-netns b/tests/expected/lsfd/mkfds-netns index 4b4c0acad1..89d5befdc9 100644 --- a/tests/expected/lsfd/mkfds-netns +++ b/tests/expected/lsfd/mkfds-netns @@ -1,4 +1,4 @@ - net +net NAME_FD == NAME_NS: 0 NAME_FD == net:[INO_FD]: 0 NAME_FD == net:[INO_NS]: 0 diff --git a/tests/expected/lsfd/mkfds-pidfd b/tests/expected/lsfd/mkfds-pidfd index 3f7edbb41f..9484699204 100644 --- a/tests/expected/lsfd/mkfds-pidfd +++ b/tests/expected/lsfd/mkfds-pidfd @@ -1,2 +1,2 @@ - 3 UNKN anon_inodefs pid=1 comm=systemd nspid=1 systemd 1 +3 UNKN anon_inodefs pid=1 comm=systemd nspid=1 systemd 1 ASSOC,STTYPE,SOURCE,NAME,PIDFD.COMM,PIDFD.PID: 0 diff --git a/tests/expected/lsfd/mkfds-ping-ping b/tests/expected/lsfd/mkfds-ping-ping index cad42b1c23..06fe2bdb35 100644 --- a/tests/expected/lsfd/mkfds-ping-ping +++ b/tests/expected/lsfd/mkfds-ping-ping @@ -1,4 +1,4 @@ - 3 PING state=established id=9999 laddr=127.0.0.1 raddr=127.0.0.1 established dgram 127.0.0.1 127.0.0.1 9999 +3 PING state=established id=9999 laddr=127.0.0.1 raddr=127.0.0.1 established dgram 127.0.0.1 127.0.0.1 9999 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,PING.ID: 0 - 3 PING state=close id=9999 laddr=127.0.0.1 close dgram 127.0.0.1 0.0.0.0 9999 +3 PING state=close id=9999 laddr=127.0.0.1 close dgram 127.0.0.1 0.0.0.0 9999 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,PING.ID: 0 diff --git a/tests/expected/lsfd/mkfds-ping-ping6 b/tests/expected/lsfd/mkfds-ping-ping6 index 3ef973040c..6919ba1ab1 100644 --- a/tests/expected/lsfd/mkfds-ping-ping6 +++ b/tests/expected/lsfd/mkfds-ping-ping6 @@ -1,4 +1,4 @@ - 3 PINGv6 state=established id=9999 laddr=::1 raddr=::1 established dgram ::1 ::1 9999 +3 PINGv6 state=established id=9999 laddr=::1 raddr=::1 established dgram ::1 ::1 9999 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,PING.ID: 0 - 3 PINGv6 state=close id=9999 laddr=::1 close dgram ::1 :: 9999 +3 PINGv6 state=close id=9999 laddr=::1 close dgram ::1 :: 9999 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,PING.ID: 0 diff --git a/tests/expected/lsfd/mkfds-pipe-no-fork b/tests/expected/lsfd/mkfds-pipe-no-fork index 390b8a39aa..4cd2a550cd 100644 --- a/tests/expected/lsfd/mkfds-pipe-no-fork +++ b/tests/expected/lsfd/mkfds-pipe-no-fork @@ -1,5 +1,5 @@ - 3 r-- FIFO pipefs - 4 -w- FIFO pipefs wronly,nonblock +3 r-- FIFO pipefs +4 -w- FIFO pipefs wronly,nonblock ASSOC,MODE,TYPE,SOURCE,FLAGS: 0 PID[RUN]: 0 PID[STR]: 0 diff --git a/tests/expected/lsfd/mkfds-raw b/tests/expected/lsfd/mkfds-raw index e8bc41a015..37baddc774 100644 --- a/tests/expected/lsfd/mkfds-raw +++ b/tests/expected/lsfd/mkfds-raw @@ -1,2 +1,2 @@ - 3 RAW state=established protocol=5 laddr=127.0.0.1 raddr=127.0.0.2 established raw 127.0.0.1 127.0.0.2 5 +3 RAW state=established protocol=5 laddr=127.0.0.1 raddr=127.0.0.2 established raw 127.0.0.1 127.0.0.2 5 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,RAW.PROTOCOL: 0 diff --git a/tests/expected/lsfd/mkfds-raw6 b/tests/expected/lsfd/mkfds-raw6 index a813a374e4..2d77e8f3ba 100644 --- a/tests/expected/lsfd/mkfds-raw6 +++ b/tests/expected/lsfd/mkfds-raw6 @@ -1,2 +1,2 @@ - 3 RAWv6 state=established protocol=5 laddr=::1 raddr=::ffff:127.0.0.1 established raw ::1 ::ffff:127.0.0.1 5 +3 RAWv6 state=established protocol=5 laddr=::1 raddr=::ffff:127.0.0.1 established raw ::1 ::ffff:127.0.0.1 5 ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,RAW.PROTOCOL: 0 diff --git a/tests/expected/lsfd/mkfds-ro-block-device b/tests/expected/lsfd/mkfds-ro-block-device index 3b2fe07c29..4c38d05534 100644 --- a/tests/expected/lsfd/mkfds-ro-block-device +++ b/tests/expected/lsfd/mkfds-ro-block-device @@ -1,4 +1,4 @@ - 3 r-- BLK 0 loop blk +3 r-- BLK 0 loop blk ASSOC,MODE,TYPE,,POS,,BLKDRV,DEVTYPE: 0 NAME[RUN]: 0 NAME[STR]: 0 diff --git a/tests/expected/lsfd/mkfds-ro-regular-file b/tests/expected/lsfd/mkfds-ro-regular-file index 092f40b165..662daa8f21 100644 --- a/tests/expected/lsfd/mkfds-ro-regular-file +++ b/tests/expected/lsfd/mkfds-ro-regular-file @@ -1,4 +1,4 @@ -ABC 3 r-- REG /etc/passwd 1 +ABC 3 r-- REG /etc/passwd 1 COMMAND,ASSOC,MODE,TYPE,NAME,POS: 0 PID[RUN]: 0 PID[STR]: 0 diff --git a/tests/expected/lsfd/mkfds-rw-character-device b/tests/expected/lsfd/mkfds-rw-character-device index 00423f4f02..fed92ecf1a 100644 --- a/tests/expected/lsfd/mkfds-rw-character-device +++ b/tests/expected/lsfd/mkfds-rw-character-device @@ -1,4 +1,4 @@ - 3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5 +3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5 ASSOC,MODE,TYPE,NAME,SOURCE,POS,MAJ:MIN,CHRDRV,DEVTYPE,RDEV: 0 DEV[RUN]: 0 STAT[RUN]: 0 diff --git a/tests/expected/lsfd/mkfds-signalfd b/tests/expected/lsfd/mkfds-signalfd index 8d0443f8cd..16bf7323e6 100644 --- a/tests/expected/lsfd/mkfds-signalfd +++ b/tests/expected/lsfd/mkfds-signalfd @@ -1,2 +1,2 @@ - 3 signalfd mask=FPE,USR1,42 FPE,USR1,42 +3 signalfd mask=FPE,USR1,42 FPE,USR1,42 ASSOC,TYPE,NAME,SIGNALFD.MASK: 0 diff --git a/tests/expected/lsfd/mkfds-socketpair b/tests/expected/lsfd/mkfds-socketpair index a015353996..d8ba4d0bc5 100644 --- a/tests/expected/lsfd/mkfds-socketpair +++ b/tests/expected/lsfd/mkfds-socketpair @@ -1,3 +1,3 @@ - 3 rw- SOCK sockfs UNIX - 4 rw- SOCK sockfs UNIX +3 rw- SOCK sockfs UNIX +4 rw- SOCK sockfs UNIX ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0 diff --git a/tests/expected/lsfd/mkfds-symlink b/tests/expected/lsfd/mkfds-symlink index ab101592c1..6084e8392a 100644 --- a/tests/expected/lsfd/mkfds-symlink +++ b/tests/expected/lsfd/mkfds-symlink @@ -1,2 +1,2 @@ - 3 --- LINK /dev/stdin nofollow,path +3 --- LINK /dev/stdin nofollow,path ASSOC,MODE,TYPE,NAME,FLAGS: 0 diff --git a/tests/expected/lsfd/mkfds-tcp b/tests/expected/lsfd/mkfds-tcp index dfec0ae8e1..da973f423b 100644 --- a/tests/expected/lsfd/mkfds-tcp +++ b/tests/expected/lsfd/mkfds-tcp @@ -1,4 +1,4 @@ - 3 TCP SOCK state=listen laddr=127.0.0.1:34567 listen stream 1 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 - 4 TCP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567 - 5 TCP SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 127.0.0.1:23456 23456 +3 TCP SOCK state=listen laddr=127.0.0.1:34567 listen stream 1 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 +4 TCP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567 +5 TCP SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 127.0.0.1:23456 23456 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0 diff --git a/tests/expected/lsfd/mkfds-tcp6 b/tests/expected/lsfd/mkfds-tcp6 index 26b6039f19..d3be7dd04d 100644 --- a/tests/expected/lsfd/mkfds-tcp6 +++ b/tests/expected/lsfd/mkfds-tcp6 @@ -1,4 +1,4 @@ - 3 TCPv6 SOCK state=listen laddr=[::1]:34567 listen stream 1 ::1 :: [::1]:34567 34567 [::]:0 0 - 4 TCPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established stream 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567 - 5 TCPv6 SOCK state=established laddr=[::1]:34567 raddr=[::1]:23456 established stream 0 ::1 ::1 [::1]:34567 34567 [::1]:23456 23456 +3 TCPv6 SOCK state=listen laddr=[::1]:34567 listen stream 1 ::1 :: [::1]:34567 34567 [::]:0 0 +4 TCPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established stream 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567 +5 TCPv6 SOCK state=established laddr=[::1]:34567 raddr=[::1]:23456 established stream 0 ::1 ::1 [::1]:34567 34567 [::1]:23456 23456 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0 diff --git a/tests/expected/lsfd/mkfds-timerfd-alarm b/tests/expected/lsfd/mkfds-timerfd-alarm index 1c37de6cfb..10dc4c3cd4 100644 --- a/tests/expected/lsfd/mkfds-timerfd-alarm +++ b/tests/expected/lsfd/mkfds-timerfd-alarm @@ -1,16 +1,16 @@ - 3 timerfd clockid=realtime-alarm +3 timerfd clockid=realtime-alarm ASSOC,TYPE,NAME: 0 - realtime-alarm +realtime-alarm CLOCKID: 0 - 0.000000000 +0.000000000 TIMERFD.REMAINING: 0 - 0.000000000 +0.000000000 TIMERFD.INTERVAL: 0 - 3 timerfd clockid=boottime-alarm +3 timerfd clockid=boottime-alarm ASSOC,TYPE,NAME: 0 - boottime-alarm +boottime-alarm CLOCKID: 0 - 0.000000000 +0.000000000 TIMERFD.REMAINING: 0 - 0.000000000 +0.000000000 TIMERFD.INTERVAL: 0 diff --git a/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only b/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only index 97a0f6e397..b708c29df1 100644 --- a/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only +++ b/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only @@ -1,8 +1,8 @@ - 3 timerfd clockid=boottime interval=10.123456789 +3 timerfd clockid=boottime interval=10.123456789 ASSOC,TYPE,NAME: 0 - boottime +boottime CLOCKID: 0 - 0.000000000 +0.000000000 TIMERFD.REMAINING: 0 - 10.123456789 +10.123456789 TIMERFD.INTERVAL: 0 diff --git a/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only b/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only index e9d67022a9..7aedda6a51 100644 --- a/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only +++ b/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only @@ -1,8 +1,8 @@ - 3 timerfd clockid=monotonic remaining=100.987654321 +3 timerfd clockid=monotonic remaining=100.987654321 ASSOC,TYPE,NAME: 0 - monotonic +monotonic CLOCKID: 0 100.987654321 TIMERFD.REMAINING: 0 - 0.000000000 +0.000000000 TIMERFD.INTERVAL: 0 diff --git a/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval b/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval index 0119d2c541..4ba3d8e6b4 100644 --- a/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval +++ b/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval @@ -1,8 +1,8 @@ - 3 timerfd clockid=realtime remaining=100.987654321 interval=5.123456789 +3 timerfd clockid=realtime remaining=100.987654321 interval=5.123456789 ASSOC,TYPE,NAME: 0 - realtime +realtime CLOCKID: 0 100.987654321 TIMERFD.REMAINING: 0 - 5.123456789 +5.123456789 TIMERFD.INTERVAL: 0 diff --git a/tests/expected/lsfd/mkfds-udp b/tests/expected/lsfd/mkfds-udp index 58ce260dfe..a7a7837953 100644 --- a/tests/expected/lsfd/mkfds-udp +++ b/tests/expected/lsfd/mkfds-udp @@ -1,24 +1,24 @@ - 3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 - 4 UDP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567 +3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 +4 UDP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 - 3 UDP SOCK 0 +3 UDP SOCK 0 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 NAME pattern match: OK - 4 UDP SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 +4 UDP SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.RADDR,UDP.RPORT: 0 LADDR/LPORT pattern match: OK - 3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 - 4 UDP SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:23456 23456 0.0.0.0:0 0 +3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 +4 UDP SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:23456 23456 0.0.0.0:0 0 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 - 3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 - 4 UDP-Lite SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567 +3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0 +4 UDP-Lite SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0 - 3 UDP-Lite SOCK 0 +3 UDP-Lite SOCK 0 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0 NAME pattern match: OK - 4 UDP-Lite SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 +4 UDP-Lite SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.RADDR,UDPLite.RPORT: 0 LADDR/LPORT pattern match: OK - 3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 - 4 UDP-Lite SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0 +3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 +4 UDP-Lite SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 diff --git a/tests/expected/lsfd/mkfds-udp6 b/tests/expected/lsfd/mkfds-udp6 index e29797bfd9..c7b1ba038b 100644 --- a/tests/expected/lsfd/mkfds-udp6 +++ b/tests/expected/lsfd/mkfds-udp6 @@ -1,24 +1,24 @@ - 3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 - 4 UDPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567 +3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 +4 UDPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 - 3 UDPv6 SOCK 0 +3 UDPv6 SOCK 0 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 NAME pattern match: OK - 4 UDPv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567 +4 UDPv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.RADDR,UDP.RPORT: 0 LADDR/LPORT pattern match: OK - 3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 - 4 UDPv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0 +3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 +4 UDPv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0 - 3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 - 4 UDPLITEv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567 +3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 +4 UDPLITEv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0 - 3 UDPLITEv6 SOCK 0 +3 UDPLITEv6 SOCK 0 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0 NAME pattern match: OK - 4 UDPLITEv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567 +4 UDPLITEv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.RADDR,UDPLite.RPORT: 0 LADDR/LPORT pattern match: OK - 3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 - 4 UDPLITEv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0 +3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0 +4 UDPLITEv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0 diff --git a/tests/expected/lsfd/mkfds-unix-dgram b/tests/expected/lsfd/mkfds-unix-dgram index b8fd9d4778..9576cefe24 100644 --- a/tests/expected/lsfd/mkfds-unix-dgram +++ b/tests/expected/lsfd/mkfds-unix-dgram @@ -1,6 +1,6 @@ - 3 SOCK state=connected path=test_mkfds-unix-dgram type=dgram connected dgram 0 test_mkfds-unix-dgram - 4 SOCK state=connected type=dgram connected dgram 0 +3 SOCK state=connected path=test_mkfds-unix-dgram type=dgram connected dgram 0 test_mkfds-unix-dgram +4 SOCK state=connected type=dgram connected dgram 0 ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=connected path=@test_mkfds-unix-dgram type=dgram connected dgram 0 @test_mkfds-unix-dgram - 4 SOCK state=connected type=dgram connected dgram 0 +3 SOCK state=connected path=@test_mkfds-unix-dgram type=dgram connected dgram 0 @test_mkfds-unix-dgram +4 SOCK state=connected type=dgram connected dgram 0 ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 diff --git a/tests/expected/lsfd/mkfds-unix-in-netns-dgram b/tests/expected/lsfd/mkfds-unix-in-netns-dgram index c33dd9a7cc..48ac72faac 100644 --- a/tests/expected/lsfd/mkfds-unix-in-netns-dgram +++ b/tests/expected/lsfd/mkfds-unix-in-netns-dgram @@ -1,6 +1,6 @@ - 5 SOCK state=unconnected path=test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 test_mkfds-unix-dgram-ns +5 SOCK state=unconnected path=test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 test_mkfds-unix-dgram-ns ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 the netns for the dgram socket is extracted as expectedly - 5 SOCK state=unconnected path=@test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 @test_mkfds-unix-dgram-ns +5 SOCK state=unconnected path=@test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 @test_mkfds-unix-dgram-ns ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 the netns for the abstract dgram socket is extracted as expectedly diff --git a/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket b/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket index 1f70061118..b997e55a90 100644 --- a/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket +++ b/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket @@ -1,6 +1,6 @@ - 5 SOCK state=listen path=test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-ns +5 SOCK state=listen path=test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-ns ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 the netns for the seqpacket socket is extracted as expectedly - 5 SOCK state=listen path=@test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 @test_mkfds-unix-seqpacket-ns +5 SOCK state=listen path=@test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 @test_mkfds-unix-seqpacket-ns ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 the netns for the abstract seqpacket socket is extracted as expectedly diff --git a/tests/expected/lsfd/mkfds-unix-in-netns-stream b/tests/expected/lsfd/mkfds-unix-in-netns-stream index fd091059aa..c4ec9d499b 100644 --- a/tests/expected/lsfd/mkfds-unix-in-netns-stream +++ b/tests/expected/lsfd/mkfds-unix-in-netns-stream @@ -1,6 +1,6 @@ - 5 SOCK state=listen path=test_mkfds-unix-stream-ns listen stream 1 test_mkfds-unix-stream-ns +5 SOCK state=listen path=test_mkfds-unix-stream-ns listen stream 1 test_mkfds-unix-stream-ns ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 the netns for the stream socket is extracted as expectedly - 5 SOCK state=listen path=@test_mkfds-unix-stream-ns listen stream 1 @test_mkfds-unix-stream-ns +5 SOCK state=listen path=@test_mkfds-unix-stream-ns listen stream 1 @test_mkfds-unix-stream-ns ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 the netns for the abstract stream socket is extracted as expectedly diff --git a/tests/expected/lsfd/mkfds-unix-stream b/tests/expected/lsfd/mkfds-unix-stream index c2e64a780d..645be81845 100644 --- a/tests/expected/lsfd/mkfds-unix-stream +++ b/tests/expected/lsfd/mkfds-unix-stream @@ -1,32 +1,32 @@ - 3 SOCK state=listen path=test_mkfds-unix-stream listen stream 1 test_mkfds-unix-stream - 4 SOCK state=connected connected stream 0 - 5 SOCK state=connected path=test_mkfds-unix-stream connected stream 0 test_mkfds-unix-stream +3 SOCK state=listen path=test_mkfds-unix-stream listen stream 1 test_mkfds-unix-stream +4 SOCK state=connected connected stream 0 +5 SOCK state=connected path=test_mkfds-unix-stream connected stream 0 test_mkfds-unix-stream ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=@test_mkfds-unix-stream-abs listen stream 1 @test_mkfds-unix-stream-abs - 4 SOCK state=connected connected stream 0 - 5 SOCK state=connected path=@test_mkfds-unix-stream-abs connected stream 0 @test_mkfds-unix-stream-abs +3 SOCK state=listen path=@test_mkfds-unix-stream-abs listen stream 1 @test_mkfds-unix-stream-abs +4 SOCK state=connected connected stream 0 +5 SOCK state=connected path=@test_mkfds-unix-stream-abs connected stream 0 @test_mkfds-unix-stream-abs (abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=test_mkfds-unix-stream-shutdown listen stream 1 test_mkfds-unix-stream-shutdown - 4 SOCK state=connected connected stream 0 - 5 SOCK state=connected path=test_mkfds-unix-stream-shutdown connected stream 0 test_mkfds-unix-stream-shutdown +3 SOCK state=listen path=test_mkfds-unix-stream-shutdown listen stream 1 test_mkfds-unix-stream-shutdown +4 SOCK state=connected connected stream 0 +5 SOCK state=connected path=test_mkfds-unix-stream-shutdown connected stream 0 test_mkfds-unix-stream-shutdown (shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=test_mkfds-unix with spaces stream listen stream 1 test_mkfds-unix with spaces stream - 4 SOCK state=connected connected stream 0 - 5 SOCK state=connected path=test_mkfds-unix with spaces stream connected stream 0 test_mkfds-unix with spaces stream +3 SOCK state=listen path=test_mkfds-unix with spaces stream listen stream 1 test_mkfds-unix with spaces stream +4 SOCK state=connected connected stream 0 +5 SOCK state=connected path=test_mkfds-unix with spaces stream connected stream 0 test_mkfds-unix with spaces stream ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket - 4 SOCK state=connected type=seqpacket connected seqpacket 0 - 5 SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket +3 SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket +4 SOCK state=connected type=seqpacket connected seqpacket 0 +5 SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=@test_mkfds-unix-seqpacket-abs listen stream 1 @test_mkfds-unix-seqpacket-abs - 4 SOCK state=connected connected stream 0 - 5 SOCK state=connected path=@test_mkfds-unix-seqpacket-abs connected stream 0 @test_mkfds-unix-seqpacket-abs +3 SOCK state=listen path=@test_mkfds-unix-seqpacket-abs listen stream 1 @test_mkfds-unix-seqpacket-abs +4 SOCK state=connected connected stream 0 +5 SOCK state=connected path=@test_mkfds-unix-seqpacket-abs connected stream 0 @test_mkfds-unix-seqpacket-abs (abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=test_mkfds-unix-seqpacket-shutdown type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-shutdown - 4 SOCK state=connected type=seqpacket connected seqpacket 0 - 5 SOCK state=connected path=test_mkfds-unix-seqpacket-shutdown type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket-shutdown +3 SOCK state=listen path=test_mkfds-unix-seqpacket-shutdown type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-shutdown +4 SOCK state=connected type=seqpacket connected seqpacket 0 +5 SOCK state=connected path=test_mkfds-unix-seqpacket-shutdown type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket-shutdown (shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 - 3 SOCK state=listen path=test_mkfds-unix with spaces seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix with spaces seqpacket - 4 SOCK state=connected type=seqpacket connected seqpacket 0 - 5 SOCK state=connected path=test_mkfds-unix with spaces seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix with spaces seqpacket +3 SOCK state=listen path=test_mkfds-unix with spaces seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix with spaces seqpacket +4 SOCK state=connected type=seqpacket connected seqpacket 0 +5 SOCK state=connected path=test_mkfds-unix with spaces seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix with spaces seqpacket ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0 diff --git a/tests/expected/lsfd/option-inet b/tests/expected/lsfd/option-inet index cebfded43c..66edac9c55 100644 --- a/tests/expected/lsfd/option-inet +++ b/tests/expected/lsfd/option-inet @@ -1,46 +1,46 @@ # --inet - 3 TCP state=listen laddr=127.0.0.1:34567 - 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 - 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 - 3 TCPv6 state=listen laddr=[::1]:34567 - 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 - 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 - 3 UDP state=close laddr=127.0.0.1:34567 - 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 - 3 UDPLITEv6 state=close laddr=[::1]:34567 - 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +3 TCP state=listen laddr=127.0.0.1:34567 +4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 +3 TCPv6 state=listen laddr=[::1]:34567 +4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 +3 UDP state=close laddr=127.0.0.1:34567 +4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +3 UDPLITEv6 state=close laddr=[::1]:34567 +4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 # --inet=4 - 3 TCP state=listen laddr=127.0.0.1:34567 - 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 - 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 - 3 UDP state=close laddr=127.0.0.1:34567 - 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +3 TCP state=listen laddr=127.0.0.1:34567 +4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 +3 UDP state=close laddr=127.0.0.1:34567 +4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 # --inet=6 - 3 TCPv6 state=listen laddr=[::1]:34567 - 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 - 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 - 3 UDPLITEv6 state=close laddr=[::1]:34567 - 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +3 TCPv6 state=listen laddr=[::1]:34567 +4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 +3 UDPLITEv6 state=close laddr=[::1]:34567 +4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 # -i - 3 TCP state=listen laddr=127.0.0.1:34567 - 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 - 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 - 3 TCPv6 state=listen laddr=[::1]:34567 - 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 - 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 - 3 UDP state=close laddr=127.0.0.1:34567 - 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 - 3 UDPLITEv6 state=close laddr=[::1]:34567 - 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +3 TCP state=listen laddr=127.0.0.1:34567 +4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 +3 TCPv6 state=listen laddr=[::1]:34567 +4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 +3 UDP state=close laddr=127.0.0.1:34567 +4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +3 UDPLITEv6 state=close laddr=[::1]:34567 +4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 # -i4 - 3 TCP state=listen laddr=127.0.0.1:34567 - 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 - 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 - 3 UDP state=close laddr=127.0.0.1:34567 - 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +3 TCP state=listen laddr=127.0.0.1:34567 +4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 +5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 +3 UDP state=close laddr=127.0.0.1:34567 +4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 # -i6 - 3 TCPv6 state=listen laddr=[::1]:34567 - 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 - 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 - 3 UDPLITEv6 state=close laddr=[::1]:34567 - 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +3 TCPv6 state=listen laddr=[::1]:34567 +4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 +5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456 +3 UDPLITEv6 state=close laddr=[::1]:34567 +4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567 diff --git a/tests/expected/lsfd/option-summary b/tests/expected/lsfd/option-summary index 4e96f55764..058de3742d 100644 --- a/tests/expected/lsfd/option-summary +++ b/tests/expected/lsfd/option-summary @@ -1,3 +1,3 @@ - 10 GROUP - 3 PASSWD - 13 PROC +10 GROUP + 3 PASSWD +13 PROC diff --git a/tests/ts/column/table b/tests/ts/column/table index 8b22d838e6..5d5e1311d2 100755 --- a/tests/ts/column/table +++ b/tests/ts/column/table @@ -65,6 +65,13 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest +ts_init_subtest "noheaders" +$TS_CMD_COLUMN --table $TS_SELF/files/table \ + --table-noheadings \ + --table-columns VERYLONG,COLUMN,NAMES \ + >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_finalize_subtest + ts_init_subtest "truncate" $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \ |