qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed dsvprintf to work with different implementations of vsnprintf.

Browse source
This commit is contained in:
Brian Koropoff 2002-12-17 22:35:14 +00:00
parent a84b6bba5d
commit f03cc28b7d
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/util/dstring.c
View file

@ -194,7 +194,7 @@ dstring_clearstr (dstring_t *dstr)
static int
_dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
{
int size, rsize;
int size;
#ifdef VA_LIST_IS_ARRAY
va_list tmp_args;
@ -203,15 +203,22 @@ _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
if (!dstr->truesize)
dstring_clearstr (dstr); // Make it a string
// +1 for null
rsize = (size = vsnprintf (dstr->str + offs, dstr->truesize - offs, fmt, args)) + offs + 1;
dstr->size = rsize;
if (rsize > dstr->truesize) {
// Some vsnprintf implementations return -1 on truncation
while ((size = vsnprintf (dstr->str + offs, dstr->truesize - offs, fmt, args)) == -1) {
dstr->size = dstr->truesize + 1024;
dstring_adjust (dstr);
#ifdef VA_LIST_IS_ARRAY
VA_COPY (args, tmp_args);
#endif
vsnprintf (dstr->str + offs, dstr->size - offs, fmt, args);
}
dstr->size = size + offs + 1;
// "Proper" implementations return the required size
if (dstr->size > dstr->truesize) {
dstring_adjust (dstr);
#ifdef VA_LIST_IS_ARRAY
VA_COPY (args, tmp_args);
#endif
vsnprintf (dstr->str + offs, dstr->truesize - offs, fmt, args);
}
return size;
}