From b8c2b7f8565ca4a5c99a295d8fec3f981c07fde5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 1 Feb 2022 09:24:02 +0900
Subject: [PATCH] [ruamoko] Make a common sprintf wrapper function

This takes care of converting from progs varargs to what PR_Sprintf
expects. I got tired of modifying the wrappers when I found a third one.
---
 include/rua_internal.h       |  5 +++++
 libs/ruamoko/rua_string.c    | 26 +++++++++++++++++++++++---
 ruamoko/qwaq/builtins/main.c | 19 ++-----------------
 tools/qfcc/test/test-bi.c    | 26 +++++++-------------------
 4 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/include/rua_internal.h b/include/rua_internal.h
index 24e16cc6e..a41177bae 100644
--- a/include/rua_internal.h
+++ b/include/rua_internal.h
@@ -33,6 +33,9 @@
 
 #include "QF/quakeio.h"
 
+struct progs_s;
+struct dstring_s;
+
 void RUA_Cbuf_Init (struct progs_s *pr, int secure);
 void RUA_Cmd_Init (struct progs_s *pr, int secure);
 void RUA_Cvar_Init (struct progs_s *pr, int secure);
@@ -49,6 +52,8 @@ void RUA_String_Init (struct progs_s *pr, int secure);
 void RUA_QFile_Init (struct progs_s *pr, int secure);
 void RUA_QFS_Init (struct progs_s *pr, int secure);
 
+void RUA_Sprintf (struct progs_s *pr, struct dstring_s *dstr);
+
 int QFile_AllocHandle (struct progs_s *pr, QFile *file);
 QFile *QFile_GetFile (struct progs_s *pr, int handle);
 struct plitem_s *Plist_GetItem (struct progs_s *pr, int handle);
diff --git a/libs/ruamoko/rua_string.c b/libs/ruamoko/rua_string.c
index e01ab9716..4fdbab706 100644
--- a/libs/ruamoko/rua_string.c
+++ b/libs/ruamoko/rua_string.c
@@ -60,16 +60,36 @@ bi_strlen (progs_t *pr)
 	R_INT (pr) = strlen(s);
 }
 
-static void
-bi_sprintf (progs_t *pr)
+void
+RUA_Sprintf (progs_t *pr, dstring_t *dstr)
 {
 	const char *fmt = P_GSTRING (pr, 0);
 	int         count = pr->pr_argc - 1;
 	pr_type_t **args = pr->pr_params + 1;
+
+	if (pr->progs->version == PROG_VERSION) {
+		__auto_type va_list = &P_PACKED (pr, pr_va_list_t, 1);
+		count = va_list->count;
+		if (count) {
+			args = alloca (count * sizeof (pr_type_t *));
+			for (int i = 0; i < count; i++) {
+				args[i] = &pr->pr_globals[va_list->list + i * 4];
+			}
+		} else {
+			args = 0;
+		}
+	}
+
+	PR_Sprintf (pr, dstr, "bi_sprintf", fmt, count, args);
+}
+
+static void
+bi_sprintf (progs_t *pr)
+{
 	dstring_t  *dstr;
 
 	dstr = dstring_newstr ();
-	PR_Sprintf (pr, dstr, "bi_sprintf", fmt, count, args);
+	RUA_Sprintf (pr, dstr);
 	RETURN_STRING (pr, dstr->str);
 	dstring_delete (dstr);
 }
diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c
index 670515fc0..8e9449d40 100644
--- a/ruamoko/qwaq/builtins/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -53,6 +53,7 @@
 #include "QF/zone.h"
 
 #include "compat.h"
+#include "rua_internal.h"
 
 #include "ruamoko/qwaq/qwaq.h"
 #include "ruamoko/qwaq/debugger/debug.h"
@@ -147,25 +148,9 @@ init_qf (void)
 static void
 bi_printf (progs_t *pr)
 {
-	const char *fmt = P_GSTRING (pr, 0);
-	int         count = pr->pr_argc - 1;
-	pr_type_t **args = pr->pr_params + 1;
 	dstring_t  *dstr = dstring_new ();
 
-	if (pr->progs->version == PROG_VERSION) {
-		__auto_type va_list = &P_PACKED (pr, pr_va_list_t, 1);
-		count = va_list->count;
-		if (count) {
-			args = alloca (count * sizeof (pr_type_t *));
-			for (int i = 0; i < count; i++) {
-				args[i] = &pr->pr_globals[va_list->list + i * 4];
-			}
-		} else {
-			args = 0;
-		}
-	}
-
-	PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
+	RUA_Sprintf (pr, dstr);
 	if (dstr->str) {
 		Sys_Printf ("%s", dstr->str);
 	}
diff --git a/tools/qfcc/test/test-bi.c b/tools/qfcc/test/test-bi.c
index 412a341bf..e12220f8f 100644
--- a/tools/qfcc/test/test-bi.c
+++ b/tools/qfcc/test/test-bi.c
@@ -40,37 +40,25 @@
 #include "QF/dstring.h"
 #include "QF/progs.h"
 
+#include "rua_internal.h"
 #include "test-bi.h"
 
 static void
 bi_printf (progs_t *pr)
 {
-	const char *fmt = P_GSTRING (pr, 0);
-	int         count = pr->pr_argc - 1;
-	pr_type_t **args = pr->pr_params + 1;
 	static dstring_t *dstr;
 
-	if (!dstr)
+	if (!dstr) {
 		dstr = dstring_new ();
-	else
+	} else {
 		dstring_clear (dstr);
-
-	if (pr->progs->version == PROG_VERSION) {
-		__auto_type va_list = &P_PACKED (pr, pr_va_list_t, 1);
-		count = va_list->count;
-		if (count) {
-			args = alloca (count * sizeof (pr_type_t *));
-			for (int i = 0; i < count; i++) {
-				args[i] = &pr->pr_globals[va_list->list + i * 4];
-			}
-		} else {
-			args = 0;
-		}
 	}
 
-	PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
-	if (dstr->str)
+	RUA_Sprintf (pr, dstr);
+
+	if (dstr->str) {
 		fputs (dstr->str, stdout);
+	}
 }
 
 static void