From a5db139a0a671e1f7422d6cd387f4bc8d0afb8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Sun, 10 Jan 2021 15:57:46 +0100 Subject: Linux: use correct column alignment for wide fields This affects: - PROC_COMM, PROC_EXE and CWD on Linux - JAIL on FreeBSD and DragonFlyBSD - ZONE on Solaris --- freebsd/FreeBSDProcess.c | 11 +++-------- freebsd/FreeBSDProcessList.c | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'freebsd') diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index f5ed5d5e..28d482e8 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -71,14 +71,9 @@ static void FreeBSDProcess_writeField(const Process* this, RichString* str, Proc switch (field) { // add FreeBSD-specific fields here case JID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, fp->jid); break; - case JAIL: { - xSnprintf(buffer, n, "%-11s ", fp->jname); - if (buffer[11] != '\0') { - buffer[11] = ' '; - buffer[12] = '\0'; - } - break; - } + case JAIL: + Process_printLeftAlignedField(str, attr, fp->jname ? fp->jname : "N/A", 11); + return; case TTY_NR: if (fp->ttyPath) { if (fp->ttyPath == nodevStr) diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 9beb9239..679f640d 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -414,7 +414,7 @@ static char* FreeBSDProcessList_readJailName(const struct kinfo_proc* kproc) { char* jname = NULL; char jnamebuf[MAXHOSTNAMELEN]; - if (kproc->ki_jid != 0 ) { + if (kproc->ki_jid != 0) { struct iovec jiov[6]; memset(jnamebuf, 0, sizeof(jnamebuf)); -- cgit v1.2.3