From: Masatake YAMATO Date: Sun, 5 Mar 2023 00:50:51 +0000 (+0900) Subject: lsfd: (style) reformat colinfo array X-Git-Tag: v2.39-rc1~12^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=737776941289d1b3f4fc250366f8f9fe9e26ec8d;p=thirdparty%2Futil-linux.git lsfd: (style) reformat colinfo array Signed-off-by: Masatake YAMATO --- diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index 1280a7a76a..a0e9f9e782 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -120,139 +120,204 @@ struct colinfo { /* columns descriptions */ static const struct colinfo infos[] = { - [COL_AINODECLASS] - = { "AINODECLASS",0,SCOLS_FL_RIGHT,SCOLS_JSON_STRING, - N_("class of anonymous inode") }, - [COL_ASSOC] = { "ASSOC", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("association between file and process") }, - [COL_BLKDRV] = { "BLKDRV", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("block device driver name resolved by /proc/devices") }, - [COL_CHRDRV] = { "CHRDRV", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("character device driver name resolved by /proc/devices") }, - [COL_COMMAND] = { "COMMAND",0.3, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, - N_("command of the process opening the file") }, - [COL_DELETED] = { "DELETED", 0, SCOLS_FL_RIGHT, SCOLS_JSON_BOOLEAN, - N_("reachability from the file system") }, - [COL_DEV] = { "DEV", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("ID of device containing file") }, - [COL_DEVTYPE] = { "DEVTYPE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("device type (blk, char, or nodev)") }, - [COL_ENDPOINTS] ={"ENDPOINTS",0, SCOLS_FL_WRAP, SCOLS_JSON_STRING, - N_("IPC endpoints information communicated with the fd") }, - [COL_FLAGS] = { "FLAGS", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("flags specified when opening the file") }, - [COL_FD] = { "FD", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("file descriptor for the file") }, - [COL_FUID] = { "FUID", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("user ID number of the file's owner") }, - [COL_INODE] = { "INODE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("inode number") }, - [COL_INET_LADDR]={"INET.LADDR",0,SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("local IP address") }, - [COL_INET_RADDR]={"INET.RADDR",0,SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("remote IP address") }, - [COL_INET6_LADDR]={"INET6.LADDR",0,SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("local IPv6 address") }, - [COL_INET6_RADDR]={"INET6.RADDR",0,SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("remote IPv6 address") }, - [COL_KNAME] = { "KNAME", 0.4, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, - N_("name of the file (raw)") }, - [COL_KTHREAD] = { "KTHREAD", 0, SCOLS_FL_RIGHT, SCOLS_JSON_BOOLEAN, - N_("opened by a kernel thread") }, - [COL_MAJMIN] = { "MAJ:MIN", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("device ID for special, or ID of device containing file") }, - [COL_MAPLEN] = { "MAPLEN", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("length of file mapping (in page)") }, - [COL_MISCDEV] = { "MISCDEV", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("misc character device name resolved by /proc/misc") }, - [COL_MNT_ID] = { "MNTID", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("mount id") }, - [COL_MODE] = { "MODE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("access mode (rwx)") }, - [COL_NAME] = { "NAME", 0.4, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, - N_("name of the file (cooked)") }, - [COL_NETLINK_GROUPS]={"NETLINK.GROUPS", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("netlink multicast groups") }, - [COL_NETLINK_LPORT]={"NETLINK.LPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("netlink local port id") }, - [COL_NETLINK_PROTOCOL]={"NETLINK.PROTOCOL", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("netlink protocol") }, - [COL_NLINK] = { "NLINK", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("link count") }, - [COL_NS_NAME] = { "NS.NAME", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("name of the namespace (NS.TYPE:[INODE])") }, - [COL_NS_TYPE] = { "NS.TYPE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("type of the namespace") }, - [COL_OWNER] = { "OWNER", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("owner of the file") }, - [COL_PARTITION]={ "PARTITION",0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("block device name resolved by /proc/partition") }, - [COL_PID] = { "PID", 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("PID of the process opening the file") }, - [COL_PIDFD_COMM]={"PIDFD.COMM",0.2,SCOLS_FL_TRUNC,SCOLS_JSON_STRING, - N_("command of the process targeted by the pidfd") }, - [COL_PIDFD_NSPID]={"PIDFD.NSPID",0.2,SCOLS_FL_TRUNC,SCOLS_JSON_STRING, - N_("NSpid field in fdinfo of the pidfd") }, - [COL_PIDFD_PID]={ "PIDFD.PID",5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("PID of the process targeted by the pidfd") }, - [COL_PING_ID]={ "PING.ID", 0,SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("ICMP echo request ID") }, - [COL_POS] = { "POS", 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("file position") }, - [COL_RAW_PROTOCOL]={ "RAW.PROTOCOL",0,SCOLS_FL_RIGHT,SCOLS_JSON_NUMBER, - N_("protocol number of the raw socket") }, - [COL_RDEV] = { "RDEV", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("device ID (if special file)") }, - [COL_SIZE] = { "SIZE", 4, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("file size"), }, - [COL_SOCK_LISTENING]={"SOCK.LISTENING",0,SCOLS_FL_RIGHT,SCOLS_JSON_BOOLEAN, - N_("listening socket") }, - [COL_SOCK_NETNS]={"SOCK.NETNS", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("inode identifying network namespace where the socket belongs to") }, - [COL_SOCK_PROTONAME]={"SOCK.PROTONAME",0,SCOLS_FL_RIGHT,SCOLS_JSON_STRING, - N_("protocol name") }, - [COL_SOCK_STATE]={"SOCK.STATE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("State of socket") }, - [COL_SOCK_TYPE] ={"SOCK.TYPE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("Type of socket") }, - [COL_SOURCE] = { "SOURCE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("file system, partition, or device containing file") }, - [COL_STTYPE] = { "STTYPE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("file type (raw)") }, - [COL_TCP_LADDR]={ "TCP.LADDR",0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("local TCP address (INET address:TCP port)") }, - [COL_TCP_RADDR]={"TCP.RADDR", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("remote TCP address (INET address:TCP port)") }, - [COL_TCP_LPORT]={"TCP.LPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("local TCP port") }, - [COL_TCP_RPORT]={"TCP.RPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("remote TCP port") }, - [COL_TID] = { "TID", 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("thread ID of the process opening the file") }, - [COL_TYPE] = { "TYPE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("file type (cooked)") }, - [COL_UDP_LADDR]={ "UDP.LADDR",0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("local UDP address (INET address:UDP port)") }, - [COL_UDP_RADDR]={"UDP.RADDR", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("remote UDP address (INET address:UDP port)") }, - [COL_UDP_LPORT]={"UDP.LPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("local UDP port") }, - [COL_UDP_RPORT]={"UDP.RPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("remote UDP port") }, - [COL_UDPLITE_LADDR]={ "UDPLITE.LADDR",0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("local UDPLite address (INET address:UDPLite port)") }, - [COL_UDPLITE_RADDR]={"UDPLITE.RADDR", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("remote UDPLite address (INET address:UDPLite port)") }, - [COL_UDPLITE_LPORT]={"UDPLITE.LPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("local UDPLite port") }, - [COL_UDPLITE_RPORT]={"UDPLITE.RPORT", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("remote UDPLite port") }, - [COL_UID] = { "UID", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, - N_("user ID number of the process") }, - [COL_UNIX_PATH]={ "UNIX.PATH",0.4,SCOLS_FL_TRUNC,SCOLS_JSON_STRING, - N_("filesystem pathname for UNIX doamin socketo") }, - [COL_USER] = { "USER", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("user of the process") }, + [COL_AINODECLASS] = { "AINODECLASS", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("class of anonymous inode") }, + [COL_ASSOC] = { "ASSOC", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("association between file and process") }, + [COL_BLKDRV] = { "BLKDRV", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("block device driver name resolved by /proc/devices") }, + [COL_CHRDRV] = { "CHRDRV", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("character device driver name resolved by /proc/devices") }, + [COL_COMMAND] = { "COMMAND", + 0.3, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, + N_("command of the process opening the file") }, + [COL_DELETED] = { "DELETED", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_BOOLEAN, + N_("reachability from the file system") }, + [COL_DEV] = { "DEV", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("ID of device containing file") }, + [COL_DEVTYPE] = { "DEVTYPE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("device type (blk, char, or nodev)") }, + [COL_ENDPOINTS] = { "ENDPOINTS", + 0, SCOLS_FL_WRAP, SCOLS_JSON_STRING, + N_("IPC endpoints information communicated with the fd") }, + [COL_FLAGS] = { "FLAGS", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("flags specified when opening the file") }, + [COL_FD] = { "FD", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("file descriptor for the file") }, + [COL_FUID] = { "FUID", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("user ID number of the file's owner") }, + [COL_INODE] = { "INODE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("inode number") }, + [COL_INET_LADDR] = { "INET.LADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("local IP address") }, + [COL_INET_RADDR] = { "INET.RADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("remote IP address") }, + [COL_INET6_LADDR] = { "INET6.LADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("local IPv6 address") }, + [COL_INET6_RADDR] = { "INET6.RADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("remote IPv6 address") }, + [COL_KNAME] = { "KNAME", + 0.4, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, + N_("name of the file (raw)") }, + [COL_KTHREAD] = { "KTHREAD", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_BOOLEAN, + N_("opened by a kernel thread") }, + [COL_MAJMIN] = { "MAJ:MIN", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("device ID for special, or ID of device containing file") }, + [COL_MAPLEN] = { "MAPLEN", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("length of file mapping (in page)") }, + [COL_MISCDEV] = { "MISCDEV", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("misc character device name resolved by /proc/misc") }, + [COL_MNT_ID] = { "MNTID", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("mount id") }, + [COL_MODE] = { "MODE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("access mode (rwx)") }, + [COL_NAME] = { "NAME", + 0.4, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, + N_("name of the file (cooked)") }, + [COL_NETLINK_GROUPS] = { "NETLINK.GROUPS", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("netlink multicast groups") }, + [COL_NETLINK_LPORT] = { "NETLINK.LPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("netlink local port id") }, + [COL_NETLINK_PROTOCOL] = { "NETLINK.PROTOCOL", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("netlink protocol") }, + [COL_NLINK] = { "NLINK", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("link count") }, + [COL_NS_NAME] = { "NS.NAME", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("name of the namespace (NS.TYPE:[INODE])") }, + [COL_NS_TYPE] = { "NS.TYPE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("type of the namespace") }, + [COL_OWNER] = { "OWNER", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("owner of the file") }, + [COL_PARTITION] = { "PARTITION", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("block device name resolved by /proc/partition") }, + [COL_PID] = { "PID", + 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("PID of the process opening the file") }, + [COL_PIDFD_COMM] = { "PIDFD.COMM", + 0.2, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, + N_("command of the process targeted by the pidfd") }, + [COL_PIDFD_NSPID] = { "PIDFD.NSPID", + 0.2, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, + N_("NSpid field in fdinfo of the pidfd") }, + [COL_PIDFD_PID] = { "PIDFD.PID", + 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("PID of the process targeted by the pidfd") }, + [COL_PING_ID] = { "PING.ID", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("ICMP echo request ID") }, + [COL_POS] = { "POS", + 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("file position") }, + [COL_RAW_PROTOCOL] = { "RAW.PROTOCOL", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("protocol number of the raw socket") }, + [COL_RDEV] = { "RDEV", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("device ID (if special file)") }, + [COL_SIZE] = { "SIZE", + 4, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("file size"), }, + [COL_SOCK_LISTENING] = { "SOCK.LISTENING", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_BOOLEAN, + N_("listening socket") }, + [COL_SOCK_NETNS] = { "SOCK.NETNS", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("inode identifying network namespace where the socket belongs to") }, + [COL_SOCK_PROTONAME] = { "SOCK.PROTONAME", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("protocol name") }, + [COL_SOCK_STATE] = { "SOCK.STATE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("State of socket") }, + [COL_SOCK_TYPE] = { "SOCK.TYPE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("Type of socket") }, + [COL_SOURCE] = { "SOURCE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("file system, partition, or device containing file") }, + [COL_STTYPE] = { "STTYPE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("file type (raw)") }, + [COL_TCP_LADDR] = { "TCP.LADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("local TCP address (INET address:TCP port)") }, + [COL_TCP_RADDR] = { "TCP.RADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("remote TCP address (INET address:TCP port)") }, + [COL_TCP_LPORT] = { "TCP.LPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("local TCP port") }, + [COL_TCP_RPORT] = { "TCP.RPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("remote TCP port") }, + [COL_TID] = { "TID", + 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("thread ID of the process opening the file") }, + [COL_TYPE] = { "TYPE", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("file type (cooked)") }, + [COL_UDP_LADDR] = { "UDP.LADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("local UDP address (INET address:UDP port)") }, + [COL_UDP_RADDR] = { "UDP.RADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("remote UDP address (INET address:UDP port)") }, + [COL_UDP_LPORT] = { "UDP.LPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("local UDP port") }, + [COL_UDP_RPORT] = { "UDP.RPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("remote UDP port") }, + [COL_UDPLITE_LADDR] = { "UDPLITE.LADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("local UDPLite address (INET address:UDPLite port)") }, + [COL_UDPLITE_RADDR] = { "UDPLITE.RADDR", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("remote UDPLite address (INET address:UDPLite port)") }, + [COL_UDPLITE_LPORT] = { "UDPLITE.LPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("local UDPLite port") }, + [COL_UDPLITE_RPORT] = { "UDPLITE.RPORT", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("remote UDPLite port") }, + [COL_UID] = { "UID", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, + N_("user ID number of the process") }, + [COL_UNIX_PATH] = { "UNIX.PATH", + 0.4, SCOLS_FL_TRUNC, SCOLS_JSON_STRING, + N_("filesystem pathname for UNIX doamin socketo") }, + [COL_USER] = { "USER", + 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, + N_("user of the process") }, }; static const int default_columns[] = {