From af155bdff33cc2150944a5298bd6c5d4e57d16ae Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 28 Dec 1996 05:04:24 +0000
Subject: [PATCH] Add comment that range checking is already done at upper
 level Kill snprintf left in collate.c from previous backout

Should go in 2.2
---
 lib/libc/locale/collate.c       | 9 ++++++---
 lib/libc/locale/setrunelocale.c | 1 +
 lib/libc/stdtime/strftime.c     | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index 79e410c1a817..4228ef5cdad6 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: collate.c,v 1.9 1996/11/26 02:49:31 ache Exp $
+ * $Id: collate.c,v 1.10 1996/12/16 17:32:56 joerg Exp $
  */
 
 #include <rune.h>
@@ -73,8 +73,11 @@ __collate_load_tables(encoding)
 		__collate_load_error = save_load_error;
 		return -1;
 	}
-	(void) snprintf(buf, sizeof buf, "%s/%s/LC_COLLATE",
-			_PathLocale, encoding);
+	/* Range checking already done at upper level caller */
+	(void) strcpy(buf, _PathLocale);
+	(void) strcat(buf, "/");
+	(void) strcat(buf, encoding);
+	(void) strcat(buf, "/LC_COLLATE");
 	if ((fp = fopen(buf, "r")) == NULL) {
 		__collate_load_error = save_load_error;
 		return -1;
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 228efe2908a7..65daa836ffe6 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -85,6 +85,7 @@ _xpg4_setrunelocale(encoding)
 
 	if (!_PathLocale)
 		return(EFAULT);
+	/* Range checking already done at upper level caller */
 	(void) strcpy(name, _PathLocale);
 	(void) strcat(name, "/");
 	(void) strcat(name, encoding);
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 33d74b868dd1..2b773dbb67cc 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -17,7 +17,7 @@
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-	"$Id: strftime.c,v 1.11 1996/07/19 15:17:44 wollman Exp $";
+	"$Id: strftime.c,v 1.12 1996/11/26 02:52:52 ache Exp $";
 #endif
 
 #ifndef lint
@@ -509,6 +509,7 @@ __time_load_locale(const char *name)
 
 	if (!_PathLocale)
 		goto no_locale;
+	/* Range checking already done at upper level caller */
 	strcpy(filename, _PathLocale);
 	strcat(filename, "/");
 	strcat(filename, name);