libsmartcols: don't include hidden headers in column width calculation

Fixes #2380

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>

diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c
index ad0b15d92d5266d70a2bffce69186488a15c6b6d..cb7e0203868837f88d4b42e4f47a5a3770ea2e7b 100644 (file)
--- 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 (file)
index 0000000..5fc905d
--- /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 e90044c13269d02473b23edc7b2bd0fb68956f3c..a5d764f5813668fa0cadc06e0031548b65c78fd6 100644 (file)
--- 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 f93e19e1f8f6af4f1e35c8841315a15f73504832..b1561dd2c8030f5676ec0cddb779ab63a5e9bf4d 100644 (file)
--- 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 269cea5d93d62798263b4ca5f33cf6b521f84d7a..5fe751ce4066b1d8459b837861bb16a880fd1006 100644 (file)
--- 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 97cab8470ebd2ade8c0e023507f28f50619230e9..86e46bca6dc01d52129aba56c6cfec6f9492b592 100644 (file)
--- 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 878b621e9bb457c8fcd0779d2763c1f3c0492d32..ccaf14e49ec8562d7be840e8c3e32ea5b1c4c7d4 100644 (file)
--- 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 49abe8174742b0fceffbac31d791b859ea650e13..10e3c5e7f5343e971d5bb6e04d3d3ce58744200a 100644 (file)
--- 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 446a916448bc7cd5c513130c2594c981444f725d..e7fc7c637ba41e6eb06d4af01248153d6ffd1ee3 100644 (file)
--- 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 bd94e567f07d072f00049aed499d40f63066c649..b4aaf7b5fa222b8627698ac572f9a1558fa080c8 100644 (file)
--- 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 8b26e3251d8b6278b568be908bbb069013e6043b..e6ed958fcfaee1b655910d7d32ea7b3ae66acf1b 100644 (file)
--- 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 39e4ce24b500da5209f7f87bd40e218a67ee0b71..db40d9255676fe5e4f8a72dc9ecea23dbed2a2e3 100644 (file)
--- 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 69588d96cd4a4a2262dba5bbadc8f16af00f58e1..15363f5761b6edcd98d0b53ac9969e8a235f0bc5 100644 (file)
--- 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 a3278d2cd086ef12b64e0ebf809b9386fe85e32c..6c9a9632ea9637263b72fde8544f16647165ab1d 100644 (file)
--- 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 63b435600e089023de1711f5189e8641279d544f..7028264da283ac63150f7ba8f754a1f61d51f938 100644 (file)
--- 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 22a61b78c48e7e4e0cf03d6c306d40fb7e03cc0c..ec00f65647b32be9a9635f1fd23499b9a47f50a1 100644 (file)
--- 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 7f5a23d621fe49c9aee7bf71f70d2e74cf73bb6d..05b2dd1e4db9fef42bf218d6df30db3a95b10f8f 100644 (file)
--- 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 13b77f6c4770a73312d61cd42d61aa7bcff98a82..bd0cca6c9adb8cc1b828546d5d5eaa0ad7b9f235 100644 (file)
--- 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 e5474b0e7d4a38764aeed21141424f5e5acd7f72..8ab32fd442fe515a92ab765d4b726f80c244bbf9 100644 (file)
--- 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 7c971d6227844a8d7e1371e037de67262d90da89..60d87a9b44a9b072987f0a76736d6428e8e04aaf 100644 (file)
--- 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 6bef3aec1e84bcd46cb7a96ca1872e9fdb7cf71e..5217d7939a3b36c9420dd5b3ca91346981af2601 100644 (file)
--- 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 fd7f2935cc6c2ad421e47c9629cda25859995789..62c9d5ced0994e7dde97346863a9cc9357a6b590 100644 (file)
--- 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 70519bd4d67940cc780abf5ae574e41f308d18ff..d99157e3cf315588370018db62c7ac1e91ab4438 100644 (file)
--- 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 8f035ffba211e136bc79d263e6784b579b0b6c17..d494fb483686213d9bc591363abdc2425593419a 100644 (file)
--- 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 7c1b5037d04e4d6007363ef86088d9bacd7584b0..ec8795b7009e04211de4b24850369e90bf254d12 100644 (file)
--- 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 fda65c471eb4b340e4b72059d710000648777aa3..b08de13139fa16d3a68dc547e4dcb6805126e8c7 100644 (file)
--- 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 ad50da1d3845e7ad8f6d90ce292dfac53a0d7404..e78c8ebcee3cd0aab2efa389da75d28a0b414bbf 100644 (file)
--- 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 df3dce7f8eb361287136e2972100a8a1a2f48a72..77c4e1f4805a05dbf2a8a948c68e737173176fd9 100644 (file)
--- 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 4b4c0acad14d9ae96f60694fa82fd5be60a01d7b..89d5befdc97daa03873caff5537ffb96f47b67e9 100644 (file)
--- 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 3f7edbb41fcb38f2d783377744baea31dba878ea..9484699204d4dd7f153a1bec2c969a59d00668d4 100644 (file)
--- 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 cad42b1c23dd1dd81e59d4e9fd28c92e78197492..06fe2bdb359934264bc464d882826b472f37bae5 100644 (file)
--- 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 3ef973040cf01168e5f9fef0935e0c828068863f..6919ba1ab18754259b7f61052214f221e47cf81b 100644 (file)
--- 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 390b8a39aa88f72c3f0ebb8d753660603fc35129..4cd2a550cdc37b7de778c906eb46ec11d48539da 100644 (file)
--- 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 e8bc41a0158e0afe9e4d1588b7d94950c1f53c81..37baddc774bc8d340f6cc3c71c0bbbbe50a64834 100644 (file)
--- 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 a813a374e4f3efb72675121bdac01f619a73dbc2..2d77e8f3ba730f275ad275a3a198aa0b28723fdc 100644 (file)
--- 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 3b2fe07c29cf4f3f6ad0a68bf1963b274a4a6e3a..4c38d05534878eacabfa82a29e79a4e6d431c479 100644 (file)
--- 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 092f40b165df4b526adc9dffe312410e9e00dd2c..662daa8f21e19f72d3f7cdfaaadf538383c0f5c6 100644 (file)
--- 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 00423f4f028ebc5893bfab03c5068ce1431fcc07..fed92ecf1ac39e7091ff936512b9c4226ed88269 100644 (file)
--- 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 8d0443f8cdb7fba69ce266a1adb85e866126a599..16bf7323e6692b5d9780ba6417b4030e32d56173 100644 (file)
--- 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 a015353996a7e7661afa9cbc0d7a450174e1d298..d8ba4d0bc50365952bca4c1e91f376281448b506 100644 (file)
--- 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 ab101592c15209c3ad1bd04446716ba6e9950e56..6084e8392a58f622d604a8936008e1e7e84b4e00 100644 (file)
--- 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 dfec0ae8e1d9cff5e1b6bb1862b260503443b1a8..da973f423b4fed46527357fc843f8305930748c6 100644 (file)
--- 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 26b6039f19c6cc1a806d27eae15556633c9da851..d3be7dd04dd9004200adfb6e5b0d78dc0a71bfb7 100644 (file)
--- 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 1c37de6cfbeff1c372ea8ef278cc3fd6cc2dda4b..10dc4c3cd4f47d963f8257e30b81edc0fe201f25 100644 (file)
--- 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 97a0f6e3978fb30fab8ddfc4bd9aeaf83261d326..b708c29df196ebd9e05e4faf08721a6123e033c5 100644 (file)
--- 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 e9d67022a96b2390135881c5e0cbbdabbe2476e0..7aedda6a51cb3ef2ad1e412d887ec5ea21d37785 100644 (file)
--- 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 0119d2c54168ca022d2e395d91047aa844eb147a..4ba3d8e6b4589544d134b2a2f682b7c561417350 100644 (file)
--- 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 58ce260dfe3c2ca72894405ea225bfd4a1b89dfc..a7a78379538383ca56ac762297bcf7f4ee7ae659 100644 (file)
--- 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 e29797bfd96d553bc428b4458ee74b213ea923a1..c7b1ba038bdac8d4b0301eb804127cd864e3f0c7 100644 (file)
--- 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 b8fd9d477868d585218eefcc98e1c7362e95c085..9576cefe24dc028c2f410ad470a0eace7a145d96 100644 (file)
--- 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 c33dd9a7cc1334949ccb4724a2281c51f0da2d84..48ac72faacfac4a4cc12b9f22f976a5e992d22de 100644 (file)
--- 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 1f70061118f5319e464047990bb6d488c22cd4be..b997e55a90d20cc4f41d563a2a4a6c68a3aa954c 100644 (file)
--- 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 fd091059aacc2219ca5fdc7de8fae4b4f040d5b8..c4ec9d499b4dc639fa533474b352b42f27f090b4 100644 (file)
--- 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 c2e64a780de4d96266f246fa61dfa34545203cca..645be818454823b946409a61c1ca3e54ffa48bce 100644 (file)
--- 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 cebfded43c674cc0d57836dbd6d903a1768a379f..66edac9c557ab7c7e09e6335e9a2e04ef27a8b47 100644 (file)
--- 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 4e96f557649d8a17ef3f363b669f3a43adc5bce3..058de3742d39abaab947d82ae33cf18186574e26 100644 (file)
--- 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 8b22d838e65f919091d8129806704999d6231662..5d5e1311d218fba6678375016993f00abf4bcfdf 100755 (executable)
--- 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 \