From owner-svn-src-head@freebsd.org Sun Nov 15 18:12:33 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C43A3462131; Sun, 15 Nov 2020 18:12:33 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZ0fm0F93z4s4r; Sun, 15 Nov 2020 18:12:31 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bdragon/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id B707829A15; Sun, 15 Nov 2020 18:12:28 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailauth.nyi.internal (Postfix) with ESMTP id 7ABF627C0054; Sun, 15 Nov 2020 13:12:26 -0500 (EST) Received: from imap1 ([10.202.2.51]) by compute3.internal (MEProxy); Sun, 15 Nov 2020 13:12:26 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enfghrlhcuvffnffculddutddmnecujfgurhepofgfggfkjghffffhvffutgesthdtredt reerjeenucfhrhhomhepfdeurhgrnhguohhnuceuvghrghhrvghnfdcuoegsughrrghgoh hnsefhrhgvvgeuufffrdhorhhgqeenucggtffrrghtthgvrhhnpeejhfeftddutdelgeek gedtgeejkeffvdejtddthefggfevuefggfefledvgefhgfenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegsughrrghgohhnodhmvghsmhhtphgr uhhthhhpvghrshhonhgrlhhithihqddutdegvdefheekieegqddukedutdekheduqdgsug hrrghgohhnpeephfhrvggvuefuffdrohhrghesihhmrghprdgttg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 1EEC5C200A5; Sun, 15 Nov 2020 13:12:26 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-570-gba0a262-fm-20201106.001-gba0a2623 Mime-Version: 1.0 Message-Id: In-Reply-To: <202011141801.0AEI1FCM000287@repo.freebsd.org> References: <202011141801.0AEI1FCM000287@repo.freebsd.org> Date: Sun, 15 Nov 2020 12:12:05 -0600 From: "Brandon Bergren" To: "Scott Long" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: =?UTF-8?Q?Re:_svn_commit:_r367687_-_in_head:_sbin/nvmecontrol_usr.sbin/m?= =?UTF-8?Q?ailwrapper_usr.sbin/pkg?= Content-Type: text/plain X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 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, 15 Nov 2020 18:12:35 -0000 > --- head/usr.sbin/pkg/pkg.c Sat Nov 14 17:57:50 2020 (r367686) > +++ head/usr.sbin/pkg/pkg.c Sat Nov 14 18:01:14 2020 (r367687) > @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -1037,6 +1038,7 @@ main(int argc, char *argv[]) > { > char pkgpath[MAXPATHLEN]; > const char *pkgarg; > + size_t len; > int i; > bool bootstrap_only, force, yes; > > @@ -1045,8 +1047,11 @@ main(int argc, char *argv[]) > pkgarg = NULL; > yes = false; > > - snprintf(pkgpath, MAXPATHLEN, "%s/sbin/pkg", > - getenv("LOCALBASE") ? getenv("LOCALBASE") : _PATH_LOCALBASE); > + if ((len = getlocalbase(pkgpath, MAXPATHLEN)) != 0) { > + fprintf(stderr, "Cannot determine local path\n"); > + exit(EXIT_FAILURE); > + } This logic is broken, it is failing on kernels that DO have user.localbase. > + strlcat(pkgpath, "/sbin/pkg", MAXPATHLEN - len); > > if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) { > bootstrap_only = true; > -- Brandon Bergren bdragon@FreeBSD.org