 @@ -1,14 +1,14 @@
-/*	$NetBSD: rcp.c,v 1.52 2022/07/18 13:01:59 rin Exp $	*/
+/*	$NetBSD: rcp.c,v 1.53 2023/08/01 08:47:24 mrg Exp $	*/
 /*
  * Copyright (c) 1983, 1990, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1990, 1992, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: rcp.c,v 1.52 2022/07/18 13:01:59 rin Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.53 2023/08/01 08:47:24 mrg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <ctype.h>
 #include <dirent.h>
 @@ -456,31 +456,31 @@ rsource(char *name, struct stat *statp)
+	}
 	(void)snprintf(path, sizeof(path),
 	    "D%04o %d %s\n", statp->st_mode & RCPMODEMASK, 0, last);
 	(void)write(rem, path, strlen(path));
 	if (response() < 0) {
 		(void)closedir(dirp);
 		return;
+	}
 	while ((dp = readdir(dirp)) != NULL) {
 		if (dp->d_ino == 0)
 			continue;
 		if (!strcmp(dp->d_name, dot) || !strcmp(dp->d_name, ".."))
 			continue;
-		if (strlen(name) + 1 + strlen(dp->d_name) >= MAXPATHLEN - 1) {
+		if (snprintf(path, sizeof(path), "%s/%s", name, dp->d_name) >=
 		    sizeof(path)) {
 			run_err("%s/%s: name too long", name, dp->d_name);
 			continue;
+		}
 		(void)snprintf(path, sizeof(path), "%s/%s", name, dp->d_name);
 		vect[0] = path;
 		source(1, vect);
+	}
 	(void)closedir(dirp);
 	(void)write(rem, "E\n", 2);
 	(void)response();
+}
 void
 sink(int argc, char *argv[])
+{
 	static BUF buffer;
 	struct stat stb;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scp.c,v 1.38 2023/07/28 04:40:54 rin Exp $	*/
+/*	$NetBSD: scp.c,v 1.39 2023/08/01 08:47:25 mrg Exp $	*/
 /* $OpenBSD: scp.c,v 1.253 2023/03/03 03:12:24 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
+ *
  * NOTE: This version should NOT be suid root.  (This uses ssh to
  * do the transfer and ssh has the necessary privileges.)
+ *
  * 1995 Timo Rinne <tri@iki.fi>, Tatu Ylonen <ylo@cs.hut.fi>
+ *
  * As far as I am concerned, the code I have written for this software
  * can be used freely for any purpose.  Any derived versions of this
  * software must be clearly marked as such, and if the derived work is
 @@ -63,27 +63,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include "includes.h"
-__RCSID("$NetBSD: scp.c,v 1.38 2023/07/28 04:40:54 rin Exp $");
+__RCSID("$NetBSD: scp.c,v 1.39 2023/08/01 08:47:25 mrg Exp $");
 #include <sys/param.h>	/* roundup MAX */
 #include <sys/types.h>
 #include <sys/poll.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -1466,31 +1466,31 @@ rsource(char *name, struct stat *statp)
 	    (u_int) (statp->st_mode & FILEMODEMASK), 0, last);
 	if (verbose_mode)
 		fmprintf(stderr, "Entering directory: %s", path);
 	(void) atomicio(vwrite, remout, path, strlen(path));
 	if (response() < 0) {
 		closedir(dirp);
 		return;
+	}
 	while ((dp = readdir(dirp)) != NULL) {
 		if (dp->d_ino == 0)
 			continue;
 		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
 			continue;
-		if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path) - 1) {
+		if ((size_t)snprintf(path, sizeof path, "%s/%s",
 		    name, dp->d_name) >= sizeof path) {
 			run_err("%s/%s: name too long", name, dp->d_name);
 			continue;
+		}
 		(void) snprintf(path, sizeof path, "%s/%s", name, dp->d_name);
 		vect[0] = path;
 		source(1, vect);
+	}
 	(void) closedir(dirp);
 	(void) atomicio(vwrite, remout, __UNCONST("E\n"), 2);
 	(void) response();
+}
 void
 sink_sftp(int argc, char *dst, const char *src, struct sftp_conn *conn)
+{
 	char *abs_src = NULL;
 	char *abs_dst = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getaddrinfo.c,v 1.123 2022/04/19 20:32:15 rillig Exp $	*/
+/*	$NetBSD: getaddrinfo.c,v 1.124 2023/08/01 08:47:25 mrg Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -45,27 +45,27 @@
  * Note:
  * - The code filters out AFs that are not supported by the kernel,
  *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
  *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
  *   in ai_flags?
  * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
  *   (1) what should we do against numeric hostname (2) what should we do
  *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
  *   non-loopback address configured?  global address configured?
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.123 2022/04/19 20:32:15 rillig Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.124 2023/08/01 08:47:25 mrg Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifndef RUMP_ACTION
 #include "namespace.h"
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
 @@ -2810,59 +2810,56 @@ res_searchN(const char *name, struct res
 	return -1;
+}
 /*
  * Perform a call on res_query on the concatenation of name and domain,
  * removing a trailing dot from name if domain is NULL.
  */
 static int
 res_querydomainN(const char *name, const char *domain,
     struct res_target *target, res_state res)
+{
 	char nbuf[MAXDNAME];
 	const char *longname = nbuf;
-	size_t n, d;
+	size_t n;
 	_DIAGASSERT(name != NULL);
 	/* XXX: target may be NULL??? */
 #ifdef DEBUG
 	if (res->options & RES_DEBUG)
 		printf(";; res_querydomain(%s, %s)\n",
 			name, domain?domain:"<Nil>");
 #endif
 	if (domain == NULL) {
 		/*
 		 * Check for trailing '.';
 		 * copy without '.' if present.
 		 */
 		n = strlen(name);
 		if (n + 1 > sizeof(nbuf)) {
 			h_errno = NO_RECOVERY;
 			return -1;
+		}
 		if (n > 0 && name[--n] == '.') {
-			strncpy(nbuf, name, n);
+			snprintf(nbuf, sizeof(nbuf), "%*s", (int)n, name);
 			nbuf[n] = '\0';
 		} else
 			longname = name;
 	} else {
-		n = strlen(name);
+		if ((size_t)snprintf(nbuf, sizeof(nbuf), "%s.%s",
-		d = strlen(domain);
+				name, domain) >= sizeof(nbuf)) {
 		if (n + 1 + d + 1 > sizeof(nbuf)) {
 			h_errno = NO_RECOVERY;
 			return -1;
+		}
 		snprintf(nbuf, sizeof(nbuf), "%s.%s", name, domain);
+	}
 	return res_queryN(longname, target, res);
+}
 #ifdef TEST
 int
 main(int argc, char *argv[]) {
 	struct addrinfo *ai, *sai;
 	int i, e;
 	char buf[1024];
 	for (i = 1; i < argc; i++) {
 		if ((e = getaddrinfo(argv[i], NULL, NULL, &sai)) != 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: res_debug.c,v 1.16 2021/09/16 20:17:46 andvar Exp $	*/
+/*	$NetBSD: res_debug.c,v 1.17 2023/08/01 08:47:25 mrg Exp $	*/
 /*
  * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2003  Internet Software Consortium.
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
  * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
  * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 @@ -87,27 +87,27 @@
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
  * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #ifdef notdef
 static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp";
 #else
-__RCSID("$NetBSD: res_debug.c,v 1.16 2021/09/16 20:17:46 andvar Exp $");
+__RCSID("$NetBSD: res_debug.c,v 1.17 2023/08/01 08:47:25 mrg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "port_before.h"
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 @@ -1173,29 +1173,33 @@ p_secstodate (u_long secs) {
 	/* XXX nonreentrant */
 	char *output = p_secstodate_output;
 	time_t myclock = secs;
 	struct tm *mytime;
 #ifdef HAVE_TIME_R
 	struct tm res;
 	mytime = gmtime_r(&myclock, &res);
 #else
 	mytime = gmtime(&myclock);
 #endif
 	mytime->tm_year += 1900;
 	mytime->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
+	if ((size_t)snprintf(output, sizeof p_secstodate_output,
-		mytime->tm_year, mytime->tm_mon, mytime->tm_mday,
+	   	     "%04d%02d%02d%02d%02d%02d",
-		mytime->tm_hour, mytime->tm_min, mytime->tm_sec);
+		     mytime->tm_year, mytime->tm_mon, mytime->tm_mday,
 		     mytime->tm_hour, mytime->tm_min, mytime->tm_sec) >
 	            sizeof p_secstodate_output) {
 		output[sizeof(p_secstodate_output) - 1] = 0;
+	}
 	return (output);
+}
 u_int16_t
 res_nametoclass(const char *buf, int *successp) {
 	unsigned long result;
 	char *endptr;
 	int success;
 	result = sym_ston(__p_class_syms, buf, &success);
 	if (success)
 		goto done;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: res_query.c,v 1.16 2015/02/24 17:56:20 christos Exp $	*/
+/*	$NetBSD: res_query.c,v 1.17 2023/08/01 08:47:25 mrg Exp $	*/
 /*
  * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
  * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
  * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 @@ -79,27 +79,27 @@
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #ifdef notdef
 static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp";
 #else
-__RCSID("$NetBSD: res_query.c,v 1.16 2015/02/24 17:56:20 christos Exp $");
+__RCSID("$NetBSD: res_query.c,v 1.17 2023/08/01 08:47:25 mrg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "port_before.h"
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <ctype.h>
 #include <errno.h>
 @@ -388,56 +388,53 @@ res_nsearch(res_state statp,
  * Perform a call on res_query on the concatenation of name and domain,
  * removing a trailing dot from name if domain is NULL.
  */
 int
 res_nquerydomain(res_state statp,
 	    const char *name,
 	    const char *domain,
 	    int class, int type,	/*%< class and type of query */
 	    u_char *answer,		/*%< buffer to put answer */
 	    int anslen)		/*%< size of answer */
+{
 	char nbuf[MAXDNAME];
 	const char *longname = nbuf;
-	size_t n, d;
+	size_t n;
 #ifdef DEBUG
 	if (statp->options & RES_DEBUG)
 		printf(";; res_nquerydomain(%s, %s, %d, %d)\n",
 		       name, domain?domain:"<Nil>", class, type);
 #endif
 	if (domain == NULL) {
 		/*
 		 * Check for trailing '.';
 		 * copy without '.' if present.
 		 */
 		n = strlen(name);
 		if (n >= MAXDNAME) {
 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
 			return (-1);
+		}
 		if (n && name[--n] == '.') {
-			strncpy(nbuf, name, n);
+			snprintf(nbuf, sizeof(nbuf), "%*s", (int)n, name);
 			nbuf[n] = '\0';
 		} else
 			longname = name;
 	} else {
-		n = strlen(name);
+		if ((size_t)snprintf(nbuf, sizeof(nbuf), "%s.%s",
-		d = strlen(domain);
+				name, domain) >= sizeof(nbuf)) {
 		if (n + d + 1 >= MAXDNAME) {
 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
 			return (-1);
+		}
 		sprintf(nbuf, "%s.%s", name, domain);
+	}
 	return (res_nquery(statp, longname, class, type, answer, anslen));
+}
 const char *
 res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
 	char *file, *cp1, *cp2;
 	char buf[BUFSIZ];
 	FILE *fp;
 	if (statp->options & RES_NOALIASES)
 		return (NULL);
 	/*

 @@ -1,14 +1,14 @@
-/*      $NetBSD: edquota.c,v 1.53 2021/11/09 09:21:31 nia Exp $ */
+/*      $NetBSD: edquota.c,v 1.54 2023/08/01 08:47:25 mrg Exp $ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Robert Elz at The University of Melbourne.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -31,27 +31,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)edquota.c	8.3 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: edquota.c,v 1.53 2021/11/09 09:21:31 nia Exp $");
+__RCSID("$NetBSD: edquota.c,v 1.54 2023/08/01 08:47:25 mrg Exp $");
 #endif
 #endif /* not lint */
 /*
  * Disk quota editor.
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/wait.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/statvfs.h>
 @@ -742,30 +742,30 @@ top:
 		if (errno == EAGAIN) {
 			sleep(1);
 			goto top;
+		}
 		warn("fork");
 		return 0;
 	case 0:
 		if (sigprocmask(SIG_SETMASK, &os, NULL) == -1)
 			err(1, "sigprocmask");
 		setgid(getgid());
 		setuid(getuid());
 		if ((ed = getenv("EDITOR")) == (char *)0)
 			ed = _PATH_VI;
-		if (strlen(ed) + strlen(ltmpfile) + 2 >= MAX_TMPSTR) {
+		if ((size_t)snprintf(p, sizeof(p), "%s %s", ed, ltmpfile) >=
 		    sizeof(p)) {
 			errx(1, "%s", "editor or filename too long");
+		}
 		snprintf(p, sizeof(p), "%s %s", ed, ltmpfile);
 		execlp(_PATH_BSHELL, _PATH_BSHELL, "-c", p, NULL);
 		err(1, "%s", ed);
 	default:
 		if (waitpid(pid, &lst, 0) == -1)
 			err(1, "waitpid");
 		if (sigprocmask(SIG_SETMASK, &os, NULL) == -1)
 			err(1, "sigprocmask");
 		if (!WIFEXITED(lst) || WEXITSTATUS(lst) != 0)
 			return 0;
 		return 1;
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ypdb.c,v 1.12 2017/01/10 21:06:17 christos Exp $	*/
+/*	$NetBSD: ypdb.c,v 1.13 2023/08/01 08:47:25 mrg Exp $	*/
 /*
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Margo Seltzer.
+ *
  * This code is derived from ndbm module of BSD4.4 db (hash) by
  * Mats O Jansson
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -28,27 +28,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ypdb.c,v 1.12 2017/01/10 21:06:17 christos Exp $");
+__RCSID("$NetBSD: ypdb.c,v 1.13 2023/08/01 08:47:25 mrg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <db.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -72,31 +72,31 @@ static DBM	*_ypdb_dbopen(const char *, i
  */
 DBM *
 ypdb_open(const char *file)
+{
 	char path[MAXPATHLEN];
 	const char *cp, *suffix;
 	cp = strrchr(file, '.');
 	if (cp != NULL && strcmp(cp, YPDB_SUFFIX) == 0)
 		suffix = "";
 	else
 		suffix = YPDB_SUFFIX;
-	if (strlen(file) + strlen(suffix) > (sizeof(path) - 1)) {
+	if ((size_t)snprintf(path, sizeof(path), "%s%s", file, suffix) >
 	    sizeof(path)) {
 		warnx("File name `%s' is too long", file);
-		return (NULL);
+		return NULL;
+	}
 	snprintf(path, sizeof(path), "%s%s", file, suffix);
 	return _ypdb_dbopen(path, O_RDONLY, 0444);
+}
 /*
  * ypdb_mktemp --
  *	Create a temporary file using mkstemp(3) based on the
  *	template provided in file.
  *	dbopen(3) file, read-write, 0644 (modified by umask(2)).
  *	Try opening as a DB_BTREE first, then DB_HASH.
  *	file won't have YPDB_SUFFIX.
+ *
  * Returns:
  *	*DBM on success; file now exists.