Correct a reversion in r1.39 which introduced a new instance of strcpy()

after r1.38 had attempted to remove them all.

1 files changed, 6 insertions, 4 deletions

diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index 2d63242..b152d3a 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -172,10 +172,12 @@ main(int argc, char **argv)
 		if (fexists(*argv)) /* refers to a file directly */
 		    pkgs[ch] = realpath(*argv, pkgnames[ch]);
 		else {		/* look for the file in the expected places */
-		    if (!(cp = fileFindByPath(NULL, *argv)))
-				/* let pkg_do() fail later, so that error is reported */
-				pkgs[ch] = strcpy(pkgnames[ch], *argv);
-		    else {
+		    if (!(cp = fileFindByPath(NULL, *argv))) {
+			/* let pkg_do() fail later, so that error is reported */
+			if (s_strlcpy(pkgnames[ch], *argv, sizeof(pkgnames[ch])))
+			    errx(1, "package name too long");
+			pkgs[ch] = pkgnames[ch];
+		    } else {
 			if (s_strlcpy(pkgnames[ch], cp, sizeof(pkgnames[ch])))
 			    errx(1, "package name too long");
 			pkgs[ch] = pkgnames[ch];