From: Masatake YAMATO <yamato@redhat.com>
Date: Sun, 9 Mar 2025 21:40:01 +0000 (+0900)
Subject: lsfd: (refactor) add a helper function building ENDPOINTS strings for UNIX socket
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=939375cbeb472d1777b51ded64f1a931615c9846;p=thirdparty%2Futil-linux.git

lsfd: (refactor) add a helper function building ENDPOINTS strings for UNIX socket

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/lsfd-cmd/sock-xinfo.c b/lsfd-cmd/sock-xinfo.c
index 4d9dfb817..c5227e333 100644
--- a/lsfd-cmd/sock-xinfo.c
+++ b/lsfd-cmd/sock-xinfo.c
@@ -629,6 +629,22 @@ static struct ipc *unix_get_peer_ipc(struct unix_xinfo *ux,
 	return get_ipc(&dummy_peer_sock.file);
 }
 
+static void unix_fill_column_append_endpoints(struct ipc *peer_ipc, char **str)
+{
+	struct list_head *e;
+
+	list_for_each_backwardly(e, &peer_ipc->endpoints) {
+		struct sock *peer_sock = list_entry(e, struct sock, endpoint.endpoints);
+		char *estr;
+
+		if (*str)
+			xstrputc(str, '\n');
+		estr = unix_xstrendpoint(peer_sock);
+		xstrappend(str, estr);
+		free(estr);
+	}
+}
+
 static bool unix_fill_column(struct proc *proc __attribute__((__unused__)),
 			     struct sock_xinfo *sock_xinfo,
 			     struct sock *sock,
@@ -639,7 +655,6 @@ static bool unix_fill_column(struct proc *proc __attribute__((__unused__)),
 {
 	struct unix_xinfo *ux = (struct unix_xinfo *)sock_xinfo;
 	struct ipc *peer_ipc;
-	struct list_head *e;
 	char shutdown_chars[3] = { 0 };
 
 	switch (column_id) {
@@ -654,9 +669,7 @@ static bool unix_fill_column(struct proc *proc __attribute__((__unused__)),
 		if (!peer_ipc)
 			break;
 
-		list_for_each_backwardly(e, &peer_ipc->endpoints) {
-			struct sock *peer_sock = list_entry(e, struct sock, endpoint.endpoints);
-			char *estr;
+		unix_fill_column_append_endpoints(peer_ipc, str);
 
 			if (*str)
 				xstrputc(str, '\n');