From nobody Fri Feb 18 01:51:42 2022 X-Original-To: dev-commits-src-branches@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 BA5C019C1DC4; Fri, 18 Feb 2022 01:51:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K0F6l0mwXz4bfN; Fri, 18 Feb 2022 01:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149103; 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=FCdupDT3qI5p5r717FDK7qGiLzj9j4Ky7nc/Bn0wOPI=; b=r9x2KOMhyx3RCRdyffT/9lWqhBoW6/xMfyAb8VrRNG2iCl/wElqQbp+ewDelhZLFpPdlya AjueJcUHMRzIfcW9gWiP3M3KbvXYs4+Z4DuL9G+9cx5iSaUY86094UQpX2JlzZcD3RIMAB Be0VYjeglFX1OVYodah19jx52L69ZpEdI5FhLUiwc1ICnu1EEVAFfs9S8yL7v/aS2x0ce1 32DTvmlBHNLvBXAbpaDDQvLtx9IJeT6THCPqzQdiYU/XByWmIsEcNQUVfp4qPAOmx8wdR5 XDqc4HrzST5QR5dtL7lqnlhCPor/eVGpaEE94XrQp6/N5g1px7SpswHPDe2YKQ== 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 C22F214DC9; Fri, 18 Feb 2022 01:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21I1pghe026231; Fri, 18 Feb 2022 01:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21I1pg8k026230; Fri, 18 Feb 2022 01:51:42 GMT (envelope-from git) Date: Fri, 18 Feb 2022 01:51:42 GMT Message-Id: <202202180151.21I1pg8k026230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a528bad95e0c - stable/12 - elfctl: error if -e is specified multiple times List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a528bad95e0c80fe612051076d53b8bc8283e239 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149103; 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=FCdupDT3qI5p5r717FDK7qGiLzj9j4Ky7nc/Bn0wOPI=; b=nGKDa8X1yexT8o2fKhP7Vc7dcepvrWWgQL/yz7GXZfNHF5M9Txei/1GpZKoYn1DQqZkcyh UuCrMynl/+U/Tu7n2Bry0liA4I8K7fDN3VyBP8TQ5tXkgFUY2t1rQtbaZOmNyxX28HInC0 JNH1kZVyOvaA6edMfntCO6+hT2+RnxTfEAXWXjP7YnqCj/iTQNvmk6518c1wXACwYymZ6A 07nPf7m9UMJ1Gd+6w3wWwDDQTKS463w7E9+B2JSkVgkx/hqaYKxSUH/thRGIJASjITO6qC t1Li4ki0QYQ6yZcRMp4rsXDHCNkek0tDzHZ2scS62DYcbHUSUVjIdzJ1jt8s0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645149103; a=rsa-sha256; cv=none; b=JZWhZEutUYxWZEa7gmLc8cschKuM1Qk4LgJ/iwKXESt+C5xG2PMhtMbXW5KdqdJ5v3DcSs IcxxR+jKLLDSY4z7DDhaC/+qOnetQ+3tsB+hhbCMbRPTVLIB1Cd5DJqoD0C5Anz2lXMKDs hddM4CR1K1nts5sgTre3oLwlADLQjDisPVshpKhUUAc5sw70/KLmWLHSCYMuyHOwXtEK4F MQtOfgiWQ1ARFqIO2HqF+/GY/zdbuG9sb/jYdBq9PLhIVsmJ6H/DZzaqpuDqdJV49+El34 VIEtDvn08bnyxmJ7MrN4ari12sbn1SZjg0AlM4B8Q5bkgyNmiI3EwJm9bVLBSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a528bad95e0c80fe612051076d53b8bc8283e239 commit a528bad95e0c80fe612051076d53b8bc8283e239 Author: Ed Maste AuthorDate: 2022-02-15 03:04:29 +0000 Commit: Ed Maste CommitDate: 2022-02-18 00:33:47 +0000 elfctl: error if -e is specified multiple times Reported by: jrm MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit f0cf9b602dc0375dfc279500e0314b7c55273bf0) --- usr.bin/elfctl/elfctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c index 1042712f828a..b4482f82e7ef 100644 --- a/usr.bin/elfctl/elfctl.c +++ b/usr.bin/elfctl/elfctl.c @@ -120,6 +120,8 @@ main(int argc, char **argv) lflag = true; break; case 'e': + if (features != NULL) + errx(1, "-e may be specified only once"); features = optarg; editfeatures = true; break;