From 63ed725fcc35cb3ec155b0a85a9ff0eac5b6da24 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 1 Mar 2023 12:55:18 +0100 Subject: [PATCH] lsfd: align --help output Signed-off-by: Karel Zak --- misc-utils/lsfd.c | 2 +- tests/expected/build-sys/config-all | 4 ++++ tests/expected/build-sys/config-all-non-nls | 4 ++++ tests/expected/build-sys/config-audit | 4 ++++ tests/expected/build-sys/config-chfnsh-libuser | 6 +++++- tests/expected/build-sys/config-chfnsh-no-password | 6 +++++- tests/expected/build-sys/config-chfnsh-pam | 6 +++++- tests/expected/build-sys/config-core | 4 ++++ tests/expected/build-sys/config-devel | 6 +++++- tests/expected/build-sys/config-devel-non-asan | 6 +++++- tests/expected/build-sys/config-devel-non-docs | 6 +++++- tests/expected/build-sys/config-non-libblkid | 4 ++++ tests/expected/build-sys/config-non-libmount | 4 ++++ tests/expected/build-sys/config-non-libs | 4 ++++ tests/expected/build-sys/config-non-libsmartcols | 4 ++++ tests/expected/build-sys/config-non-libuuid | 4 ++++ tests/expected/build-sys/config-non-nls | 4 ++++ tests/expected/build-sys/config-selinux | 6 +++++- tests/expected/build-sys/config-slang | 4 ++++ tests/expected/build-sys/config-static | 4 ++++ 20 files changed, 84 insertions(+), 8 deletions(-) diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index 8c366e68e2..cfc1948b5c 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -1459,7 +1459,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --summary[=] print summary information (only, append, or never)\n"), out); fputs(USAGE_SEPARATOR, out); - printf(USAGE_HELP_OPTIONS(23)); + printf(USAGE_HELP_OPTIONS(30)); fprintf(out, USAGE_COLUMNS); diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all index cc09c65960..0574f23d1d 100644 --- a/tests/expected/build-sys/config-all +++ b/tests/expected/build-sys/config-all @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: fdformat: flock: @@ -94,6 +96,7 @@ newgrp: libcrypt nologin: nsenter: pg: libncursesw libtinfo +pipesz: pivot_root: readprofile: rename: @@ -119,6 +122,7 @@ ul: libtinfo unshare: utmpdump: vipw: +waitpid: wall: whereis: write: diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls index cc09c65960..0574f23d1d 100644 --- a/tests/expected/build-sys/config-all-non-nls +++ b/tests/expected/build-sys/config-all-non-nls @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: fdformat: flock: @@ -94,6 +96,7 @@ newgrp: libcrypt nologin: nsenter: pg: libncursesw libtinfo +pipesz: pivot_root: readprofile: rename: @@ -119,6 +122,7 @@ ul: libtinfo unshare: utmpdump: vipw: +waitpid: wall: whereis: write: diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit index 4031db0869..bdcd0872df 100644 --- a/tests/expected/build-sys/config-audit +++ b/tests/expected/build-sys/config-audit @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -90,6 +92,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser index 0059b38123..97e1ae6056 100644 --- a/tests/expected/build-sys/config-chfnsh-libuser +++ b/tests/expected/build-sys/config-chfnsh-libuser @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -87,9 +89,10 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux nologin: nsenter: libselinux +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password index 35d5f722d2..734113e3aa 100644 --- a/tests/expected/build-sys/config-chfnsh-no-password +++ b/tests/expected/build-sys/config-chfnsh-no-password @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -87,9 +89,10 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux nologin: nsenter: libselinux +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam index eae24a293d..532013c993 100644 --- a/tests/expected/build-sys/config-chfnsh-pam +++ b/tests/expected/build-sys/config-chfnsh-pam @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -87,9 +89,10 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux nologin: nsenter: libselinux +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core index fed47bb64a..a20517cc26 100644 --- a/tests/expected/build-sys/config-core +++ b/tests/expected/build-sys/config-core @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -90,6 +92,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel index d80af4675a..568241341e 100644 --- a/tests/expected/build-sys/config-devel +++ b/tests/expected/build-sys/config-devel @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: fdformat: flock: @@ -89,11 +91,12 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux newgrp: libcrypt nologin: nsenter: libselinux pg: libncursesw libtinfo +pipesz: pivot_root: readprofile: rename: @@ -119,6 +122,7 @@ ul: libtinfo unshare: utmpdump: vipw: libselinux +waitpid: wall: whereis: write: diff --git a/tests/expected/build-sys/config-devel-non-asan b/tests/expected/build-sys/config-devel-non-asan index d80af4675a..568241341e 100644 --- a/tests/expected/build-sys/config-devel-non-asan +++ b/tests/expected/build-sys/config-devel-non-asan @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: fdformat: flock: @@ -89,11 +91,12 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux newgrp: libcrypt nologin: nsenter: libselinux pg: libncursesw libtinfo +pipesz: pivot_root: readprofile: rename: @@ -119,6 +122,7 @@ ul: libtinfo unshare: utmpdump: vipw: libselinux +waitpid: wall: whereis: write: diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs index d80af4675a..568241341e 100644 --- a/tests/expected/build-sys/config-devel-non-docs +++ b/tests/expected/build-sys/config-devel-non-docs @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: fdformat: flock: @@ -89,11 +91,12 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux newgrp: libcrypt nologin: nsenter: libselinux pg: libncursesw libtinfo +pipesz: pivot_root: readprofile: rename: @@ -119,6 +122,7 @@ ul: libtinfo unshare: utmpdump: vipw: libselinux +waitpid: wall: whereis: write: diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid index bc34d67e6b..ed38eb5c56 100644 --- a/tests/expected/build-sys/config-non-libblkid +++ b/tests/expected/build-sys/config-non-libblkid @@ -24,6 +24,7 @@ wdctl: libsmartcols zramctl: libsmartcols agetty: blkdiscard: +blkpr: blkzone: blockdev: cal: libtinfo @@ -38,6 +39,7 @@ colcrt: colrm: ctrlaltdel: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -68,6 +70,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -90,5 +93,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount index 890f7c2f92..45ff711759 100644 --- a/tests/expected/build-sys/config-non-libmount +++ b/tests/expected/build-sys/config-non-libmount @@ -31,6 +31,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -46,6 +47,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -76,6 +78,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -99,5 +102,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs index 5bf0e0c9d3..b88a6a1833 100644 --- a/tests/expected/build-sys/config-non-libs +++ b/tests/expected/build-sys/config-non-libs @@ -1,5 +1,6 @@ agetty: blkdiscard: +blkpr: blkzone: blockdev: cal: libtinfo @@ -14,6 +15,7 @@ colcrt: colrm: ctrlaltdel: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -45,6 +47,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -67,5 +70,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols index d58ec93c34..28ff817b2b 100644 --- a/tests/expected/build-sys/config-non-libsmartcols +++ b/tests/expected/build-sys/config-non-libsmartcols @@ -17,6 +17,7 @@ umount: libmount uuidd: libsystemd libuuid uuidgen: libuuid agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -31,6 +32,7 @@ colcrt: colrm: ctrlaltdel: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -61,6 +63,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -83,5 +86,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid index 77912475c1..3e5a295e4c 100644 --- a/tests/expected/build-sys/config-non-libuuid +++ b/tests/expected/build-sys/config-non-libuuid @@ -37,6 +37,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -52,6 +53,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -82,6 +84,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -105,5 +108,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls index fed47bb64a..a20517cc26 100644 --- a/tests/expected/build-sys/config-non-nls +++ b/tests/expected/build-sys/config-non-nls @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -90,6 +92,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux index fcb55bda26..4d2e5f84b4 100644 --- a/tests/expected/build-sys/config-selinux +++ b/tests/expected/build-sys/config-selinux @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -87,9 +89,10 @@ mkfs.bfs: mkfs.cramfs: libz mkfs.minix: more: libtinfo -namei: +namei: libselinux nologin: nsenter: libselinux +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang index 8eea3cf1c1..5a3ac996c1 100644 --- a/tests/expected/build-sys/config-slang +++ b/tests/expected/build-sys/config-slang @@ -45,6 +45,7 @@ wipefs: libblkid libsmartcols zramctl: libsmartcols addpart: agetty: +blkpr: blkzone: blockdev: cal: libtinfo @@ -60,6 +61,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: flock: fsck.cramfs: libz @@ -90,6 +92,7 @@ more: libtinfo namei: nologin: nsenter: +pipesz: pivot_root: readprofile: rename: @@ -113,5 +116,6 @@ uclampset: ul: libtinfo unshare: utmpdump: +waitpid: wall: whereis: diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static index 8d1b4b9b55..92de9d78f5 100644 --- a/tests/expected/build-sys/config-static +++ b/tests/expected/build-sys/config-static @@ -46,6 +46,7 @@ zramctl: libsmartcols addpart: agetty: blkid.static: STATIC +blkpr: blkzone: blockdev: cal: libtinfo @@ -61,6 +62,7 @@ colrm: ctrlaltdel: delpart: dmesg: libtinfo +fadvise: fallocate: fdisk.static: STATIC flock: @@ -95,6 +97,7 @@ namei: nologin: nsenter: nsenter.static: STATIC +pipesz: pivot_root: readprofile: rename: @@ -121,5 +124,6 @@ umount.static: STATIC unshare: unshare.static: STATIC utmpdump: +waitpid: wall: whereis: -- 2.39.5