From nobody Wed Jun 11 23:16:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bHhPS342Nz5ydgj; Wed, 11 Jun 2025 23:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHhPR6vmtz3L4J; Wed, 11 Jun 2025 23:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749683804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D/HCKm61WOOoHLOWN45z0H5BmqmD20RftFfMV3MYtM8=; b=LBiQa/Bd8cn8bUWp4dRbUoAkDfdJinbCy4/ua/GXEU984ZtR//pjbd2CahPPal4z4rMDWM FRiqEq3C7/4kdbLRvxlTqpgwcPA15z0SMJPlFun1TrbDwHrZLnZnr4E3qme3bpoDU+x8fS Sf7NEkZ1EqIyE03i8RlQ/LvlrFtQ09taH5allQ4pDlzouEK+2RADSsOg2+Q/8xDxIdKZrt E+1Ty2VoDnQTBnq0PctOo/BUgNNaovMfQnKN6NkSokeOOTZa02mAbHoH68GVGFRpJHLH9N SbeUAhDbBa3e3bhiafzeDp0EgYP/aQEqF256ObRpcnORIndWR5BXYSnJFtMqZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749683804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D/HCKm61WOOoHLOWN45z0H5BmqmD20RftFfMV3MYtM8=; b=qkusr8RHeqFVwMuBhu1UgppZ7g/zjGAIk49xzgbbv8vb7OJv5YDeLrjtVbNdyL1SiFLGNN FT0q3+EmiZhWgntgS2zmp8uq9ycDTebWvTn4PEdX8E6o/iWP36dMucSJCdZtQUp8LfEY9u A6gpKgjb0owtBdwEjdYfxxdk+EbtNjhFbnI3CPxnxWIq+m5oMbOzrsFhufCbLWIzq5g3JH L9ywan6qY71bRdO5kqhFt81dAXFT3fw7v7uO9oCOfyIPbTxd5hs9vAwEpcvCAazK5BBwRT ASu3RPCoLQV20GJfn3D4KlLhQzPFfyUkgUjQBRglI1y6KUIX8pyyCHjgHhpaQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749683804; a=rsa-sha256; cv=none; b=DqIkJ+QaiVpEWuYisQzoMqmDjmFW19wF7oZzgpRbYpCiv4bRvGrNZKIzbdTV8fuyorc2IS A4MXOoifof3AqzM6LcWVpuv7Muc3V7C0PNSD/7FgJaebRrobM+Yew0FKek2EEHTjDsHvyk +Znj+3PkhPygVc5RnXdAEyBu97nAUr0sIEm4dbhoNvrkWDD+z8Xc66J1IXbOk4bxZZUaBW dVBAt3TnDIiYlfJnDci5pf2hUn0ZDEbzNc1n+MRN/m4mDDVBIqhbcD62OxlM+Fs88B6ARh PV3fDBr1Jvu9AEOo3L8g5id6yn+gS6BJFckZE3bzX2bSBaZGEqVHJcj3YEY1Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bHhPR6W9sznHc; Wed, 11 Jun 2025 23:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55BNGhbI046317; Wed, 11 Jun 2025 23:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55BNGhxp046314; Wed, 11 Jun 2025 23:16:43 GMT (envelope-from git) Date: Wed, 11 Jun 2025 23:16:43 GMT Message-Id: <202506112316.55BNGhxp046314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 36679f7d7b56 - main - kill: Use POSIX str2sig() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36679f7d7b56094744dbad80d5163b9ed9d4c006 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=36679f7d7b56094744dbad80d5163b9ed9d4c006 commit 36679f7d7b56094744dbad80d5163b9ed9d4c006 Author: Ricardo Branco AuthorDate: 2025-05-15 16:21:54 +0000 Commit: Warner Losh CommitDate: 2025-06-11 23:16:22 +0000 kill: Use POSIX str2sig() Reviewed by: imp, kib, des, jilles Pull Request: https://github.com/freebsd/freebsd-src/pull/1696 --- bin/kill/kill.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/bin/kill/kill.c b/bin/kill/kill.c index f3d323a1ff49..ca9d557c5883 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -48,12 +48,12 @@ static void nosig(const char *); static void printsignals(FILE *); -static int signame_to_signum(const char *); static void usage(void) __dead2; int main(int argc, char *argv[]) { + char signame[SIG2STR_MAX]; long pidl; pid_t pid; int errors, numsig, ret; @@ -74,12 +74,12 @@ main(int argc, char *argv[]) usage(); numsig = strtol(*argv, &ep, 10); if (!**argv || *ep) - errx(2, "illegal signal number: %s", *argv); + errx(2, "invalid signal number: %s", *argv); if (numsig >= 128) numsig -= 128; - if (numsig <= 0 || numsig >= sys_nsig) + if (sig2str(numsig, signame) < 0) nosig(*argv); - printf("%s\n", sys_signame[numsig]); + printf("%s\n", signame); return (0); } printsignals(stdout); @@ -92,24 +92,14 @@ main(int argc, char *argv[]) warnx("option requires an argument -- s"); usage(); } - if (strcmp(*argv, "0")) { - if ((numsig = signame_to_signum(*argv)) < 0) - nosig(*argv); - } else + if (strcmp(*argv, "0") == 0) numsig = 0; + else if (str2sig(*argv, &numsig) < 0) + nosig(*argv); argc--, argv++; } else if (**argv == '-' && *(*argv + 1) != '-') { ++*argv; - if (isalpha(**argv)) { - if ((numsig = signame_to_signum(*argv)) < 0) - nosig(*argv); - } else if (isdigit(**argv)) { - numsig = strtol(*argv, &ep, 10); - if (!**argv || *ep) - errx(2, "illegal signal number: %s", *argv); - if (numsig < 0) - nosig(*argv); - } else + if (str2sig(*argv, &numsig) < 0) nosig(*argv); argc--, argv++; } @@ -143,20 +133,6 @@ main(int argc, char *argv[]) return (errors); } -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); -} - static void nosig(const char *name) {