aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/mailwrapper/mailwrapper.c4
-rw-r--r--usr.sbin/pkg/pkg.c4
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;