From 1b249101df13bc8cd455a28d5eeb87730fe2c0ae Mon Sep 17 00:00:00 2001 From: Scott Long Date: Sun, 15 Nov 2020 07:50:29 +0000 Subject: Fix the previous revision, it suffered from an incomplete change to the getlocalbase API. Also don't erroneously subtract the lenth from the buffer a second time. --- usr.sbin/pkg/pkg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin/pkg') diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 057a4236174d..0130e9da83b6 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -1047,11 +1047,11 @@ main(int argc, char *argv[]) pkgarg = NULL; yes = false; - if ((len = getlocalbase(pkgpath, MAXPATHLEN)) != 0) { + if ((len = getlocalbase(pkgpath, MAXPATHLEN)) <= 0) { fprintf(stderr, "Cannot determine local path\n"); exit(EXIT_FAILURE); } - strlcat(pkgpath, "/sbin/pkg", MAXPATHLEN - len); + strlcat(pkgpath, "/sbin/pkg", MAXPATHLEN); if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) { bootstrap_only = true; -- cgit v1.2.3