From e155dacb0f027e49dd0d6ac64628a888c6be270e Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Thu, 13 Mar 2003 15:47:33 +0000
Subject: [PATCH] a few more strlcy; ok from beck & ho

---
 src/lib/libc/string/__strerror.c  | 6 +++---
 src/lib/libc/string/__strsignal.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/libc/string/__strerror.c b/src/lib/libc/string/__strerror.c
index ae19ab33..7301a7bc 100644
--- a/src/lib/libc/string/__strerror.c
+++ b/src/lib/libc/string/__strerror.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: __strerror.c,v 1.8 2001/12/08 20:37:32 deraadt Exp $";
+static char *rcsid = "$OpenBSD: __strerror.c,v 1.9 2003/03/13 15:47:33 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef NLS
@@ -98,9 +98,9 @@ __strerror(num, buf)
 #ifdef NLS
 		strlcpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX);
 #else
-		strcpy(buf, UPREFIX);
+		strlcpy(buf, UPREFIX, NL_TEXTMAX);
 #endif
-		strncat(buf, itoa(errnum), NL_TEXTMAX-strlen(buf)-1);
+		strlcat(buf, itoa(errnum), NL_TEXTMAX);
 		errno = EINVAL;
 	}
 
diff --git a/src/lib/libc/string/__strsignal.c b/src/lib/libc/string/__strsignal.c
index 4ca5bad3..26168722 100644
--- a/src/lib/libc/string/__strsignal.c
+++ b/src/lib/libc/string/__strsignal.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: __strsignal.c,v 1.6 2001/06/27 00:58:56 lebel Exp $";
+static char *rcsid = "$OpenBSD: __strsignal.c,v 1.7 2003/03/13 15:47:33 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef NLS
@@ -89,9 +89,9 @@ __strsignal(num, buf)
 #ifdef NLS
 		strlcpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX);
 #else
-		strcpy(buf, UPREFIX);
+		strlcpy(buf, UPREFIX, NL_TEXTMAX);
 #endif
-		strncat(buf, itoa(signum), NL_TEXTMAX-strlen(buf)-1);
+		strlcat(buf, itoa(signum), NL_TEXTMAX);
 	}
 
 #ifdef NLS