From nobody Thu Sep 25 08:19:00 2025 X-Original-To: dev-commits-src-main@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 4cXRSh6VRXz686rV; Thu, 25 Sep 2025 08:19:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXRSh61lLz3YM6; Thu, 25 Sep 2025 08:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758788340; 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=BpzUnQ5NOzf/GRsLfRrP2QC8+BXWZEzc/BJ0AFFvJos=; b=TMhvBv4LkZgZ8GbLENu/HenMQy7fFB/UeW5WvKdVCMio/pE6qTJJVboF5De2GvNLm7mk2Q DLseL+5vlfcvQ2XNwJKBDSn2npNmUP0A7NEtXCkEq4UoYpaCRYcza6Pi7uP4Uzhi9daZWT rT+qgefRMdsZbzt9ZyYY8Wyl8YbTzQkpMWtv9xyIx3On1lsT18iuhZPcMV6WBMDVpVRJu6 FlrMugeK5vYQvwzhrFyzCnAasrhCD2ayJNjzuQK0AITYVSC2JMXKU5nDZpMnc6zcUdYucK mCKVDaQkwdYepXTpXwmn0Hg/cWc2QmpdvH+XxJ+jw/G74PSB9DjN+vE0DxvF5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758788340; 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=BpzUnQ5NOzf/GRsLfRrP2QC8+BXWZEzc/BJ0AFFvJos=; b=X6K+TzwiBPaiyNpvw8sIHb7X0kKsqQioyY4zN0pjudpiWMSNQ6h6zCHd6lxEZA4pLcS950 FnNp3aXeDWkgcwkDxWmCgNFtt/M4MB98O0VYBeH3ukWs91aGtwpNrj4c7dqkaEbP2PTZOd ac6YSlGLQvJ9v25Vtjq+SrQ+vZbi1ZmecuMPCOaVXArdxZ8THKZCcYpSFpxw2QLlkhNEhb vNIw51ADkXgxNCv/Wrh/afR46Rm0/XZcr2GRB2ExTCrgzm6W4IsMNa3H782jvcaGp0U9y1 h3amGZUrI8Rc65GWE2COamO21Z5Hu+jFciy8iy4htayRcqErbVfbfRkEuFfdUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758788340; a=rsa-sha256; cv=none; b=P/w5mEcoy0c3g7lGdHpE47xH+QJx3EtfEi5NSmdZCWxjMqy3zx5IM1zVTlFnWX46qpmSMx zvv/trI94zWkw+OMP/rhQSB7x/YAjBbxLGMGbLo3UKanwlwC2eBA5+0oRW2QeU9Cd9RJVb KurpjMKf81At3vtbrQaInbyTDAO0Rs0z37TykI8/SLXezVT1O4z1qBnJAZ0xPmfzT6UeyE k5hsz8mf9MRHn481TKcIN8Ry2LSrPAtMaYsCwBdMKkaV/HTT7X00fxi+X0OsFnyyyuL/T3 nyBkCG0azuReRiRqojlrDDTAalw7SD4YyFldKQSTBkwA2smTND7fImXsp5CfAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cXRSh5KVBz188s; Thu, 25 Sep 2025 08:19:00 +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 58P8J0BR000878; Thu, 25 Sep 2025 08:19:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P8J09S000875; Thu, 25 Sep 2025 08:19:00 GMT (envelope-from git) Date: Thu, 25 Sep 2025 08:19:00 GMT Message-Id: <202509250819.58P8J09S000875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b00e65ff70a4 - main - newsyslog: use str2sig() instead of own implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b00e65ff70a4613b3bf2fd2781d174fa437fbfbe Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b00e65ff70a4613b3bf2fd2781d174fa437fbfbe commit b00e65ff70a4613b3bf2fd2781d174fa437fbfbe Author: Gleb Smirnoff AuthorDate: 2025-09-25 08:18:29 +0000 Commit: Gleb Smirnoff CommitDate: 2025-09-25 08:18:29 +0000 newsyslog: use str2sig() instead of own implementation Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D52697 --- usr.sbin/newsyslog/newsyslog.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c index 0c8c2c85b893..e24e2db1155d 100644 --- a/usr.sbin/newsyslog/newsyslog.c +++ b/usr.sbin/newsyslog/newsyslog.c @@ -309,7 +309,6 @@ static int age_old_log(const char *file); static void savelog(char *from, char *to); static void createdir(const struct conf_entry *ent, char *dirpart); static void createlog(const struct conf_entry *ent); -static int parse_signal(const char *str); /* * All the following take a parameter of 'int', but expect values in the @@ -1485,8 +1484,7 @@ no_trimat: working->sig = SIGHUP; if (q && *q) { got_sig: - working->sig = parse_signal(q); - if (working->sig < 1 || working->sig >= sys_nsig) { + if (str2sig(q, &working->sig) != 0) { badline( "illegal signal in config file:\n%s", errline); @@ -2884,28 +2882,3 @@ change_attrs(const char *fname, const struct conf_entry *ent) warn("can't chflags %s NODUMP", fname); } } - -/* - * Parse a signal number or signal name. Returns the signal number parsed or -1 - * on failure. - */ -static int -parse_signal(const char *str) -{ - int sig, i; - const char *errstr; - - sig = strtonum(str, 1, sys_nsig - 1, &errstr); - - if (errstr == NULL) - return (sig); - if (strncasecmp(str, "SIG", 3) == 0) - str += 3; - - for (i = 1; i < sys_nsig; i++) { - if (strcasecmp(str, sys_signame[i]) == 0) - return (i); - } - - return (-1); -}