From e27b2a9e543243c1f983ac2ccf31e68dce60eea5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 8 Apr 2007 00:00:35 +0000
Subject: [PATCH] use PR_CatStrings for strcat and padstr. ironicly, this
 should work better for now, and definitely will by the time I'm done.

---
 libs/gamecode/engine/pr_strings.c |  2 +-
 qw/source/sv_pr_cpqw.c            | 38 ++++++++++++-------------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/libs/gamecode/engine/pr_strings.c b/libs/gamecode/engine/pr_strings.c
index 97d84660f..8fde82a30 100644
--- a/libs/gamecode/engine/pr_strings.c
+++ b/libs/gamecode/engine/pr_strings.c
@@ -399,7 +399,7 @@ pr_settempstring (progs_t *pr, char *s)
 	return string_index (pr, sr);
 }
 
-string_t
+VISIBLE string_t
 PR_CatStrings (progs_t *pr, const char *a, const char *b)
 {
 	int         lena;
diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index dd19a4cd2..41af671f8 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -74,21 +74,10 @@ PF_getuid (progs_t *pr)
 static void
 PF_strcat (progs_t *pr)
 {
-	const char *st1;
-	const char *st2;
-	int         len;
-	char       *result;
+	const char *st1 = P_GSTRING (pr, 0);
+	const char *st2 = P_GSTRING (pr, 1);
 
-	st1 = P_GSTRING (pr, 0);
-	st2 = P_GSTRING (pr, 1);
-
-	len = strlen (st1) + strlen (st2);
-	result = alloca (len + 1);
-
-	strcpy (result, st1);
-	strcat (result, st2);
-
-	RETURN_STRING (pr, result);
+	R_STRING (pr) = PR_CatStrings (pr, st1, st2);
 }
 
 /*
@@ -100,8 +89,8 @@ static void
 PF_padstr (progs_t *pr)
 {
 	const char *st;
-	unsigned int i, padlen, givenlen;
-	char       *result;
+	size_t      i, padlen, givenlen;
+	char       *padding;
 
 	st = P_GSTRING (pr, 0);
 	padlen = (unsigned int) P_FLOAT (pr, 1);
@@ -113,14 +102,14 @@ PF_padstr (progs_t *pr)
 		return;
 	}
 	// ok, lets pad it!
-	result = alloca (padlen + 1);
-	strcpy (result, st);
+	padlen -= givenlen;
+	padding = alloca (padlen + 1);
 
-	for (i = givenlen; i < padlen; i++)
-		result[i] = ' ';
-	result[i] = '\0';
+	for (i = 0; i < padlen; i++)
+		padding[i] = ' ';
+	padding[i] = '\0';
 
-	RETURN_STRING (pr, result);
+	R_STRING (pr) = PR_CatStrings (pr, st, padding);
 }
 
 /*
@@ -144,10 +133,11 @@ PF_colstr (progs_t *pr)
 {
 	const char *srcstr;
 	unsigned char *result;
-	unsigned int action, len, i;
+	unsigned    action;
+	size_t      len, i;
 
 	srcstr = P_GSTRING (pr, 0);
-	action = (unsigned int) P_FLOAT (pr, 1);
+	action = (unsigned) P_FLOAT (pr, 1);
 	len = strlen (srcstr);
 
 	// Check for errors, if any, return given string