From 2ca2fb4fa35657690af2afea3e3584496ee23ea8 Mon Sep 17 00:00:00 2001
From: tjr <tjr@FreeBSD.org>
Date: Sat, 29 Jun 2002 04:52:33 +0000
Subject: [PATCH] Avoid truncating the pathname to UNIX Domain Sockets with
 snprintf(), giving a more sensible warning when the (relatively meagre)
 sun_path limit is exceeded.

---
 bin/cat/cat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 3ea05de7939f..3d626f684aaa 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -278,8 +278,11 @@ udom_open(const char *path, int flags)
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (fd >= 0) {
 		sou.sun_family = AF_UNIX;
-		snprintf(sou.sun_path, sizeof(sou.sun_path), "%s", path);
-		len = strlen(sou.sun_path);
+		if ((len = strlcpy(sou.sun_path, path,
+		    sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) {
+			errno = ENAMETOOLONG;
+			return (-1);
+		}
 		len = offsetof(struct sockaddr_un, sun_path[len+1]);
 
 		if (connect(fd, (void *)&sou, len) < 0) {