From nobody Mon Dec 13 19:05:04 2021 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 8D16B18D4974; Mon, 13 Dec 2021 19:05:04 +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 4JCWD02C1kz4tyY; Mon, 13 Dec 2021 19:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 270291A02A; Mon, 13 Dec 2021 19:05:04 +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 1BDJ54Co057716; Mon, 13 Dec 2021 19:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDJ54nM057715; Mon, 13 Dec 2021 19:05:04 GMT (envelope-from git) Date: Mon, 13 Dec 2021 19:05:04 GMT Message-Id: <202112131905.1BDJ54nM057715@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: 5c68a2169702 - main - loader:prefix is only used for LOADER_VERIEXEC 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5c68a21697027311892481d6d615a5d6e5b47433 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639422304; 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=vdZ0S8GijZXaBh2bPVCmonhRQDIDZaMnyrONCFBBI4A=; b=am6dS5mUhHZ0htodkv9RAkm49bTfuJ7ECuxP3m4WpYuc/EjnWSI0Vs7bTmSe5OFvbm0jq+ ClGHWS15c+C7/znmJTv3VCDvFH+PVF/DwakHMHRgBuAj/cAc2Ory3iIy3qGvYyXnRo6M8l XcOKiW77ftqEGspjVBkS9Tbi7JwIIlDFi2PhRXjpCxCvjo+WBbc27UbGQdzuXZ2yCQ4WhT nW+Mxm717JVmHxj/KBlksPqH54t4lBYL5bR1kU1TBLFKbs+Gt94JUjMuKyYdJJ/BqHtXtY L7oP4BfdstD0Q7eptGNVtkCNovwKN7vWtJWOMqO8r7AvpmmqxxqPw4vsJydNEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639422304; a=rsa-sha256; cv=none; b=gEr7OMSSW3AdTyhS0d/AVmcu0YwyzoQsulN7Vos6Q/XUdeBBrJtNEAnau1KZa5QI9WQN5t I1AxzUihMbwDqG0JCL5Im5x1XhtTEF2nWXjd7HTtge+HajlEqzwyPgF4AuRnrTf+Z3ZQwL 9lUgyzEyH3PCtUB2b1sI3XNnQsZ/ievMlcmcHok1o3ovx51pg40GmcYn+/d5rmu1QkdHHA x08UCEPpsPfyNCFObg8lmFQv85HN46aF766DqM9g2nGOF22FU4uECE3uL6EqwlDPSxxqP+ Km61XHpAV9nqJPhvYYofQf4/JN76VHY7Ke95p2TDWbttFEP6XP2NHfCUHbZzPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5c68a21697027311892481d6d615a5d6e5b47433 commit 5c68a21697027311892481d6d615a5d6e5b47433 Author: Warner Losh AuthorDate: 2021-12-13 19:02:16 +0000 Commit: Warner Losh CommitDate: 2021-12-13 19:04:53 +0000 loader:prefix is only used for LOADER_VERIEXEC Only define and set prefix when LOADER_VERIEXEC is defined. It's only used by the LOADER_VERIEXEC code. Sponsored by: Netflix --- stand/common/module.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/stand/common/module.c b/stand/common/module.c index f28771396af0..772fe2bc37ce 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -112,7 +112,9 @@ command_load(int argc, char *argv[]) { struct preloaded_file *fp; char *typestr; +#ifdef LOADER_VERIEXEC char *prefix; +#endif char *skip; int dflag, dofile, dokld, ch, error; @@ -124,7 +126,10 @@ command_load(int argc, char *argv[]) command_errmsg = "no filename specified"; return (CMD_CRIT); } - prefix = skip = NULL; +#ifdef LOADER_VERIEXEC + prefix = NULL; +#endif + skip = NULL; while ((ch = getopt(argc, argv, "dkp:s:t:")) != -1) { switch(ch) { case 'd': @@ -133,9 +138,11 @@ command_load(int argc, char *argv[]) case 'k': dokld = 1; break; +#ifdef LOADER_VERIEXEC case 'p': prefix = optarg; break; +#endif case 's': skip = optarg; break;