From: Andrei Vagin <ava...@virtuozzo.com> A name of an abstract socket can contain zero characters. Now we replace only the first character. If a name contains more than one zero character, the ss tool shows only a part of the name: u_str UNCONN 0 0 @ 1931097 * 0
the output with this patch: u_str UNCONN 0 0 @@zdtm-./sk-unix-unconn-23/@ 1931097 * 0 Signed-off-by: Andrei Vagin <ava...@virtuozzo.com> --- misc/ss.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/misc/ss.c b/misc/ss.c index 5cda728..a3200a1 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -2726,10 +2726,24 @@ static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh, if (tb[UNIX_DIAG_NAME]) { int len = RTA_PAYLOAD(tb[UNIX_DIAG_NAME]); + if (len > sizeof(name) - 1) + len = sizeof(name) - 1; + memcpy(name, RTA_DATA(tb[UNIX_DIAG_NAME]), len); name[len] = '\0'; - if (name[0] == '\0') + if (name[0] == '\0') { + char *n; + name[0] = '@'; + + n = name + 1; + while (n && n < name + len) { + n = memchr(n, 0, name + len - n); + if (n == NULL) + break; + *n = '@'; + } + } stat.name = &name[0]; memcpy(stat.local.data, &stat.name, sizeof(stat.name)); } -- 2.7.4