From: Masatake YAMATO <yamato@redhat.com>
Date: Sat, 27 Mar 2021 21:23:24 +0000 (+0900)
Subject: lsfd: fill ASSOC field
X-Git-Tag: v2.38-rc1~144^2~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c812bc911ed4b2c159ab41544c25c3145d63d4b;p=thirdparty%2Futil-linux.git

lsfd: fill ASSOC field
---

diff --git a/misc-utils/lsfd-fd-file.c b/misc-utils/lsfd-fd-file.c
index 6a53b0d306..eee0ffd6c5 100644
--- a/misc-utils/lsfd-fd-file.c
+++ b/misc-utils/lsfd-fd-file.c
@@ -36,15 +36,19 @@ static bool fd_file_fill_column(struct proc *proc __attribute__((__unused__)),
 
 	switch(column_id) {
 	case COL_FD:
+	case COL_ASSOC:
 		xasprintf(&str, "%d", fd_file->fd);
-		if (!str)
-			err(EXIT_FAILURE, _("failed to add output data"));
-		if (scols_line_refer_data(ln, column_index, str))
-			err(EXIT_FAILURE, _("failed to add output data"));
-		return true;
+		break;
+	default:
+		return false;
 	};
 
-	return false;
+	if (!str)
+		err(EXIT_FAILURE, _("failed to add output data"));
+	if (scols_line_refer_data(ln, column_index, str))
+		err(EXIT_FAILURE, _("failed to add output data"));
+
+	return true;
 }
 
 const struct file_class fd_file_class = {
diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index a577845c28..c37de3dc6a 100644
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -75,6 +75,7 @@ struct colinfo {
 
 /* columns descriptions */
 static struct colinfo infos[] = {
+	[COL_ASSOC]   = { "ASSOC",    0, SCOLS_FL_RIGHT, N_("association between file and process") },
 	[COL_COMMAND] = { "COMMAND",  0, 0,              N_("command of the process opening the file") },
 	[COL_DEVICE]  = { "DEVICE",   0, SCOLS_FL_RIGHT, N_("device major and minor number") },
 	[COL_FD]      = { "FD",       0, SCOLS_FL_RIGHT, N_("file descriptor for the file") },
@@ -476,7 +477,7 @@ int main(int argc, char *argv[])
 		columns[ncolumns++] = COL_COMMAND;
 		columns[ncolumns++] = COL_PID;
 		columns[ncolumns++] = COL_USER;
-		columns[ncolumns++] = COL_FD;
+		columns[ncolumns++] = COL_ASSOC;
 		columns[ncolumns++] = COL_TYPE;
 		columns[ncolumns++] = COL_DEVICE;
 		columns[ncolumns++] = COL_INODE;
@@ -520,6 +521,7 @@ int main(int argc, char *argv[])
 			case COL_NAME:
 			case COL_TYPE:
 			case COL_USER:
+			case COL_ASSOC:
 				scols_column_set_json_type(cl, SCOLS_JSON_STRING);
 				break;
 			case COL_FD:
diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index 24c5fe8dcf..77363b73f8 100644
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -51,6 +51,7 @@ DIR *opendirf(const char *format, ...) __attribute__((format (printf, 1, 2)));
  * column IDs
  */
 enum {
+	COL_ASSOC,
 	COL_COMMAND,
 	COL_DEVICE,
 	COL_FD,