From owner-svn-src-head@freebsd.org Sun Jun 10 09:00:05 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7DFBF1008963; Sun, 10 Jun 2018 09:00:05 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F3A23769F3; Sun, 10 Jun 2018 09:00:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 940BA2722; Sun, 10 Jun 2018 09:00:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5A902Si082223; Sun, 10 Jun 2018 09:00:02 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5A902GI082222; Sun, 10 Jun 2018 09:00:02 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806100900.w5A902GI082222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 10 Jun 2018 09:00:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334920 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 334920 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 09:00:05 -0000 Author: eadler Date: Sun Jun 10 09:00:01 2018 New Revision: 334920 URL: https://svnweb.freebsd.org/changeset/base/334920 Log: top(1): use sys_signame instead of hard coding signals This enables the removal of the signal.h awk script. Shamelessly stolen from kill(1). Deleted: head/usr.bin/top/sigconv.awk Modified: head/usr.bin/top/Makefile head/usr.bin/top/commands.c Modified: head/usr.bin/top/Makefile ============================================================================== --- head/usr.bin/top/Makefile Sun Jun 10 08:59:57 2018 (r334919) +++ head/usr.bin/top/Makefile Sun Jun 10 09:00:01 2018 (r334920) @@ -4,7 +4,7 @@ PROG= top SRCS= commands.c display.c machine.c screen.c top.c \ - username.c utils.c sigdesc.h + username.c utils.c CFLAGS+= -I ${.OBJDIR} MAN= top.1 @@ -19,10 +19,4 @@ NO_WERROR= CFLAGS.clang=-Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=cast-qual LIBADD= ncursesw m kvm jail - -CLEANFILES= sigdesc.h -SIGNAL_H= ${SRCTOP}/sys/sys/signal.h -sigdesc.h: sigconv.awk ${SIGNAL_H} - awk -f ${SRCTOP}/usr.bin/top/sigconv.awk < ${SIGNAL_H} > ${.TARGET} - .include Modified: head/usr.bin/top/commands.c ============================================================================== --- head/usr.bin/top/commands.c Sun Jun 10 08:59:57 2018 (r334919) +++ head/usr.bin/top/commands.c Sun Jun 10 09:00:01 2018 (r334920) @@ -30,7 +30,6 @@ #include #include "commands.h" -#include "sigdesc.h" /* generated automatically */ #include "top.h" #include "machine.h" @@ -352,6 +351,20 @@ static const char invalid_signal_number[] = " invalid_ static const char bad_signal_name[] = " bad signal name"; static const char bad_pri_value[] = " bad priority value"; +static int +signame_to_signum(const char * sig) +{ + int n; + + if (strncasecmp(sig, "SIG", 3) == 0) + sig += 3; + for (n = 1; n < sys_nsig; n++) { + if (!strcasecmp(sys_signame[n], sig)) + return (n); + } + return (-1); +} + /* * kill_procs(str) - send signals to processes, much like the "kill" * command does; invoked in response to 'k'. @@ -363,7 +376,6 @@ kill_procs(char *str) char *nptr; int signum = SIGTERM; /* default */ int procnum; - struct sigdesc *sigp; int uid; /* reset error array */ @@ -393,18 +405,10 @@ kill_procs(char *str) } else { - /* translate the name into a number */ - for (sigp = sigdesc; sigp->name != NULL; sigp++) - { - if (strcasecmp(sigp->name, str + 1) == 0) - { - signum = sigp->number; - break; - } - } + signum = signame_to_signum(str + 1); /* was it ever found */ - if (sigp->name == NULL) + if (signum == -1 ) { return(bad_signal_name); }