diff options
| author | Scott Long <scottl@FreeBSD.org> | 2020-11-15 07:50:29 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2020-11-15 07:50:29 +0000 |
| commit | 1b249101df13bc8cd455a28d5eeb87730fe2c0ae (patch) | |
| tree | 8dc575f1821d3064471d97d0147e858cc8657e99 /usr.sbin | |
| parent | 85a5fe290b4700ad7f4673f653be77bc6ae0a4d0 (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=367702
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/mailwrapper/mailwrapper.c | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg/pkg.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index 083949f266df..9c92af02533a 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -105,10 +105,10 @@ main(int argc, char *argv[], char *envp[]) initarg(&al); addarg(&al, argv[0]); - if ((len = getlocalbase(localmailerconf, MAXPATHLEN)) != 0) + if ((len = getlocalbase(localmailerconf, MAXPATHLEN)) <= 0) err(EX_OSERR, "cannot determine local path"); - strlcat(localmailerconf, "/etc/mail/mailer.conf", MAXPATHLEN - len); + strlcat(localmailerconf, "/etc/mail/mailer.conf", MAXPATHLEN); mailerconf = localmailerconf; if ((config = fopen(localmailerconf, "r")) == NULL) 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; |