[quakeio] Rework Qgetline to use dstring

This clears up its stray memory allocation, and incidentally makes it
thread-safe.

hw/source/master.c

@@ -13,6 +13,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
+#include "QF/dstring.h"
 #include "QF/idparse.h"
 #include "QF/mathlib.h"
 #include "QF/msg.h"
@@ -245,14 +246,16 @@ SV_InitNet (void)
 	NET_Init (port);
 
 	// Add filters
+	dstring_t  *buffer = dstring_new ();
 	if ((filters = Qopen ("filters.ini", "rt"))) {
-		while ((str = Qgetline (filters))) {
+		while ((str = Qgetline (filters, buffer))) {
 			Cbuf_AddText (mst_cbuf, "filter add ");
 			Cbuf_AddText (mst_cbuf, str);
 			Cbuf_AddText (mst_cbuf, "\n");
 		}
 		Qclose (filters);
 	}
+	dstring_delete (buffer);
 }
 
 static void

include/QF/quakeio.h

@@ -58,7 +58,8 @@ int Qseek(QFile *file, long offset, int whence);
 long Qtell(QFile *file);
 int Qflush(QFile *file);
 int Qeof(QFile *file);
-const char *Qgetline(QFile *file);
+struct dstring_s;
+char *Qgetline(QFile *file, struct dstring_s *str);
 
 ///@}
 

libs/client/locs.c

@@ -41,6 +41,7 @@
 
 #include <limits.h>
 
+#include "QF/dstring.h"
 #include "QF/mathlib.h"
 #include "QF/render.h"
 #include "QF/qtypes.h"
@@ -144,6 +145,7 @@ locs_load (const char *filename)
 	const char *line;
 	vec4f_t     loc = { 0, 0, 0, 1 };
 	QFile      *file;
+	dstring_t  *buffer = dstring_new ();
 
 	tmp = va (0, "maps/%s", filename);
 	file = QFS_FOpenFile (tmp);
@@ -151,7 +153,7 @@ locs_load (const char *filename)
 		Sys_Printf ("Couldn't load %s\n", tmp);
 		return;
 	}
-	while ((line = Qgetline (file))) {
+	while ((line = Qgetline (file, buffer))) {
 		if (line[0] == '#')
 			continue;
 
@@ -178,6 +180,7 @@ locs_load (const char *filename)
 		locs_add (loc, t1);
 	}
 	Qclose (file);
+	dstring_delete (buffer);
 }
 
 void

libs/ruamoko/rua_qfile.c

@@ -51,6 +51,7 @@ typedef struct qfile_s {
 typedef struct {
 	PR_RESMAP (qfile_t) handle_map;
 	qfile_t    *handles;
+	dstring_t  *buffer;
 } qfile_resources_t;
 
 static qfile_t *
@@ -101,6 +102,7 @@ bi_qfile_destroy (progs_t *pr, void *_res)
 	qfile_resources_t *res = _res;
 
 	PR_RESDELMAP (res->handle_map);
+	dstring_delete (res->buffer);
 
 	free (res);
 }
@@ -211,7 +213,7 @@ bi_Qgetline (progs_t *pr, void *_res)
 	qfile_t    *h = get_handle (pr, res, __FUNCTION__, handle);
 	const char *s;
 
-	s = Qgetline (h->file);
+	s = Qgetline (h->file, res->buffer);
 	if (s)
 		RETURN_STRING (pr, s);
 	else
@@ -410,6 +412,7 @@ void
 RUA_QFile_Init (progs_t *pr, int secure)
 {
 	qfile_resources_t *res = calloc (sizeof (qfile_resources_t), 1);
+	res->buffer = dstring_new ();
 
 	PR_Resources_Register (pr, "QFile", res, bi_qfile_clear, bi_qfile_destroy);
 	if (secure) {

libs/util/qargs.c

@@ -44,6 +44,7 @@
 #include "QF/cmd.h"
 #include "QF/crc.h"
 #include "QF/cvar.h"
+#include "QF/dstring.h"
 #include "QF/idparse.h"
 #include "QF/qargs.h"
 #include "QF/quakefs.h"
@@ -202,8 +203,9 @@ COM_Check_quakerc (const char *cmd, cbuf_t *cbuf)
 	int ret = 0;
 	QFile *f;
 
+	dstring_t  *buffer = dstring_new ();
 	f = QFS_FOpenFile ("quake.rc");
-	while (f && (l = Qgetline (f))) {
+	while (f && (l = Qgetline (f, buffer))) {
 		if ((p = strstr (l, cmd))) {
 			if (p == l) {
 				if (cbuf) {
@@ -215,6 +217,7 @@ COM_Check_quakerc (const char *cmd, cbuf_t *cbuf)
 		}
 	}
 	Qclose (f);
+	dstring_delete (buffer);
 	return ret;
 }
 

libs/util/quakeio.c

@@ -577,35 +577,28 @@ Qeof (QFile *file)
 	Qgetline
 
 	Dynamic length version of Qgets. Do NOT free the buffer.
-	FIXME memory leak (on shutdown)
 */
-VISIBLE const char *
-Qgetline (QFile *file)
+VISIBLE char *
+Qgetline (QFile *file, dstring_t *buf)
 {
-	static int  size = 256;
-	static char *buf = 0;
 	int         len;
 
-	if (!buf) {
-		buf = malloc (size);
-		if (!buf)
-			return 0;
-	}
+	buf->size = 256 < buf->truesize ? buf->truesize : 256;
+	dstring_adjust (buf);
 
-	if (!Qgets (file, buf, size))
+	if (!Qgets (file, buf->str, buf->size)) {
 		return 0;
-
-	len = strlen (buf);
-	while (len && buf[len - 1] != '\n') {
-		char       *t = realloc (buf, size + 256);
-
-		if (!t)
-			return 0;
-		buf = t;
-		size += 256;
-		if (!Qgets (file, buf + len, size - len))
-			break;
-		len = strlen (buf);
 	}
-	return buf;
+
+	len = strlen (buf->str);
+	while (len && buf->str[len - 1] != '\n') {
+		buf->size = buf->truesize + 256;
+		dstring_adjust (buf);
+		if (!Qgets (file, buf->str, buf->size)) {
+			break;
+		}
+		len = strlen (buf->str);
+	}
+	buf->size = len + 1;
+	return buf->str;
 }

tools/qfvis/source/qfvis.c

@@ -1350,38 +1350,39 @@ LoadPortals (char *name)
 		}
 	}
 
-	line = Qgetline (f);
+	dstring_t  *buffer = dstring_new ();
+	line = Qgetline (f, buffer);
 
 	if (line && (!strcmp (line, PORTALFILE "\n")
 				 || !strcmp (line, PORTALFILE "\r\n"))) {
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &portalclusters) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &numportals) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
 		numrealleafs = portalclusters;
 	} else if (line && (!strcmp (line, PORTALFILE_AM "\n")
 						|| !strcmp (line, PORTALFILE_AM "\r\n"))) {
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &portalclusters) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &numportals) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &numrealleafs) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
 		read_leafs = 1;
 	} else if (line && (!strcmp (line, PORTALFILE2 "\n")
 						|| !strcmp (line, PORTALFILE2 "\r\n"))) {
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &numrealleafs) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &portalclusters) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line || sscanf (line, "%u\n", &numportals) != 1)
 			Sys_Error ("LoadPortals: failed to read header");
 		read_leafs = 1;
@@ -1422,7 +1423,7 @@ LoadPortals (char *name)
 	clusternums = calloc (numportals, sizeof (clusterpair_t));
 	winding_t **windings = malloc (numportals * sizeof (winding_t *));
 	for (unsigned i = 0; i < numportals; i++) {
-		line = Qgetline (f);
+		line = Qgetline (f, buffer);
 		if (!line)
 			Sys_Error ("LoadPortals: reading portal %u", i);
 
@@ -1494,7 +1495,7 @@ LoadPortals (char *name)
 	leafcluster = calloc (numrealleafs, sizeof (uint32_t));
 	if (read_leafs) {
 		for (unsigned i = 0; i < numrealleafs; i++) {
-			line = Qgetline (f);
+			line = Qgetline (f, buffer);
 			if (sscanf (line, "%i\n", &leafcluster[i]) != 1)
 				Sys_Error ("LoadPortals: parse error in leaf->cluster "
 						   "mappings");
@@ -1503,6 +1504,7 @@ LoadPortals (char *name)
 		for (unsigned i = 0; i < numrealleafs; i++)
 			leafcluster[i] = i;
 	}
+	dstring_delete (buffer);
 	Qclose (f);
 }