From 2da06d3cd0947ac504f6f5f2ab0f48bda54a7a18 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 6 May 2021 15:10:49 +0900 Subject: [PATCH] lsfd: add stubs for sockets and files of unknown type Signed-off-by: Masatake YAMATO --- misc-utils/Makemodule.am | 4 ++- misc-utils/lsfd-sock.c | 56 ++++++++++++++++++++++++++++++++++++++++ misc-utils/lsfd-unkn.c | 56 ++++++++++++++++++++++++++++++++++++++++ misc-utils/lsfd.c | 11 ++++++-- misc-utils/lsfd.h | 6 ++++- 5 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 misc-utils/lsfd-sock.c create mode 100644 misc-utils/lsfd-unkn.c diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 7ed02a7067..4c980cf707 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -254,7 +254,9 @@ lsfd_SOURCES = \ misc-utils/lsfd.h \ misc-utils/lsfd-file.c \ misc-utils/lsfd-cdev.c \ - misc-utils/lsfd-bdev.c + misc-utils/lsfd-bdev.c \ + misc-utils/lsfd-sock.c \ + misc-utils/lsfd-unkn.c lsfd_LDADD = $(LDADD) libsmartcols.la libcommon.la lsfd_LDFLAGS = -pthread lsfd_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) -pthread diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c new file mode 100644 index 0000000000..28b561bfbe --- /dev/null +++ b/misc-utils/lsfd-sock.c @@ -0,0 +1,56 @@ +/* + * lsfd-sock.c - handle associations opening socket objects + * + * Copyright (C) 2021 Red Hat, Inc. All rights reserved. + * Written by Masatake YAMATO + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it would be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "xalloc.h" +#include "nls.h" +#include "libsmartcols.h" + +#include "lsfd.h" + +static bool sock_fill_column(struct proc *proc __attribute__((__unused__)), + struct file *file __attribute__((__unused__)), + struct libscols_line *ln, + int column_id, + size_t column_index) +{ + switch(column_id) { + case COL_TYPE: + if (scols_line_set_data(ln, column_index, "SOCK")) + err(EXIT_FAILURE, _("failed to add output data")); + return true; + default: + return false; + } +} + +const struct file_class sock_class = { + .super = &file_class, + .size = sizeof(struct file), + .fill_column = sock_fill_column, + .free_content = NULL, +}; + +struct file *make_sock(const struct file_class *class, + struct stat *sb, const char *name, int fd) +{ + return make_file(class? class: &sock_class, + sb, name, fd); +} diff --git a/misc-utils/lsfd-unkn.c b/misc-utils/lsfd-unkn.c new file mode 100644 index 0000000000..f736324b99 --- /dev/null +++ b/misc-utils/lsfd-unkn.c @@ -0,0 +1,56 @@ +/* + * lsfd-unkn.c - handle associations opening unknown objects + * + * Copyright (C) 2021 Red Hat, Inc. All rights reserved. + * Written by Masatake YAMATO + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it would be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "xalloc.h" +#include "nls.h" +#include "libsmartcols.h" + +#include "lsfd.h" + +static bool unkn_fill_column(struct proc *proc __attribute__((__unused__)), + struct file *file __attribute__((__unused__)), + struct libscols_line *ln, + int column_id, + size_t column_index) +{ + switch(column_id) { + case COL_TYPE: + if (scols_line_set_data(ln, column_index, "UNKN")) + err(EXIT_FAILURE, _("failed to add output data")); + return true; + default: + return false; + } +} + +const struct file_class unkn_class = { + .super = &file_class, + .size = sizeof(struct file), + .fill_column = unkn_fill_column, + .free_content = NULL, +}; + +struct file *make_unkn(const struct file_class *class, + struct stat *sb, const char *name, int fd) +{ + return make_file(class? class: &unkn_class, + sb, name, fd); +} diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index 73fb7c49a9..5a8b222bd6 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -332,9 +332,16 @@ static struct file *collect_file(struct stat *sb, char *name, int assoc) return make_cdev(NULL, sb, name, assoc); case S_IFBLK: return make_bdev(NULL, sb, name, assoc); + case S_IFSOCK: + return make_sock(NULL, sb, name, assoc); + case S_IFLNK: + case S_IFREG: + case S_IFIFO: + case S_IFDIR: + return make_file(NULL, sb, name, assoc); + default: + return make_unkn(NULL, sb, name, assoc); } - - return make_file(NULL, sb, name, assoc); } static void read_fdinfo(struct file *file, FILE *fdinfo) diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h index 7be65e9481..88a5fbf5ce 100644 --- a/misc-utils/lsfd.h +++ b/misc-utils/lsfd.h @@ -130,7 +130,7 @@ struct file_class { void (*free_content)(struct file *file); }; -extern const struct file_class file_class, cdev_class, bdev_class; +extern const struct file_class file_class, cdev_class, bdev_class, sock_class, unkn_class; struct file *make_file(const struct file_class *class, struct stat *sb, const char *name, int association); @@ -138,6 +138,10 @@ struct file *make_cdev(const struct file_class *class, struct stat *sb, const char *name, int fd); struct file *make_bdev(const struct file_class *class, struct stat *sb, const char *name, int fd); +struct file *make_sock(const struct file_class *class, + struct stat *sb, const char *name, int fd); +struct file *make_unkn(const struct file_class *class, + struct stat *sb, const char *name, int fd); extern struct idcache *username_cache; -- 2.47.2