diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2021-01-10 15:57:46 +0100 |
---|---|---|
committer | Christian Göttsche <cgzones@googlemail.com> | 2021-01-11 12:02:25 +0100 |
commit | a5db139a0a671e1f7422d6cd387f4bc8d0afb8e7 (patch) | |
tree | b8060e0b189b7cd045d7a135c2e17593bb1fb34c /freebsd | |
parent | 8a67d7f0866bf9451aad301e98059daa5c18e7c3 (diff) |
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
Diffstat (limited to 'freebsd')
-rw-r--r-- | freebsd/FreeBSDProcess.c | 11 | ||||
-rw-r--r-- | freebsd/FreeBSDProcessList.c | 2 |
2 files changed, 4 insertions, 9 deletions
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)); |