Date: Fri, 25 May 2018 22:42:16 -0700 From: Eitan Adler <eadler@freebsd.org> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: Bruce Evans <brde@optusnet.com.au>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org> Subject: Re: svn commit: r333945 - head/usr.bin/top Message-ID: <CAF6rxgmf-3zhdRp9gxEDokCV4OOM3BDUn2=UU9SupCNVxtYFOw@mail.gmail.com> In-Reply-To: <20180521063953.GA70671@FreeBSD.org> References: <201805202319.w4KNJ9hj038452@repo.freebsd.org> <20180521094344.Q1053@besplex.bde.org> <20180521063953.GA70671@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 20 May 2018 at 23:39, Alexey Dokuchaev <danfe@freebsd.org> wrote:
> On Mon, May 21, 2018 at 10:32:30AM +1000, Bruce Evans wrote:
>> ...
>> > if (smpmode && namelength > SMPUNAMELEN)
>> > namelength = SMPUNAMELEN;
>> > else if (namelength > UPUNAMELEN)
>>
...
what about this?
commit 7d041879b4d0ad11818b5f5875b1198a722841d7
Author: Eitan Adler <lists@eitanadler.com>
Date: Sat May 26 04:30:48 2018 +0000
top(1): allow to configure the max username length
Some users prefer shorter names, and MAXLOGNAME is not a perfect method
of coming up with a default. Use 8, by request, and allow users to
configure it.
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 0f31d87..d6a9b41 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -50,8 +50,9 @@
#include "layout.h"
#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
-#define SMPUNAMELEN 13
-#define UPUNAMELEN 15
+#ifndef MAXTOPNAMELEN
+#define MAXTOPNAMELEN 8
+#endif
extern struct timeval timeout;
static int smpmode;
@@ -329,11 +330,7 @@ machine_init(struct statics *statics)
NULL, 0) == 0 && carc_en == 1)
carc_enabled = 1;
- namelength = MAXLOGNAME;
- if (smpmode && namelength > SMPUNAMELEN)
- namelength = SMPUNAMELEN;
- else if (namelength > UPUNAMELEN)
- namelength = UPUNAMELEN;
+ namelength = MAXTOPNAMELEN;
kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open");
if (kd == NULL)
--
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgmf-3zhdRp9gxEDokCV4OOM3BDUn2=UU9SupCNVxtYFOw>