cvar_t cl_playerskin = {CF_CLIENT | CF_SERVER | CF_USERINFO | CF_ARCHIVE, "playerskin", "", "current player skin in Nexuiz/Xonotic"};
char com_token[MAX_INPUTLINE];
+unsigned com_token_len;
//===========================================================================
COM_ParseToken_Simple
Parse a token out of a string
+Writes the token and its strlen to the com_token and com_token_len globals.
==============
*/
-int COM_ParseToken_Simple(const char **datapointer, qbool returnnewline, qbool parsebackslash, qbool parsecomments)
+qbool COM_ParseToken_Simple(const char **datapointer, qbool returnnewline, qbool parsebackslash, qbool parsecomments)
{
int len;
int c;
const char *data = *datapointer;
- len = 0;
- com_token[0] = 0;
+ com_token_len = len = 0;
+ com_token[0] = '\0';
if (!data)
{
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = c;
}
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
if (*data == '\"')
data++;
*datapointer = data;
{
// translate Mac line ending to UNIX
com_token[len++] = '\n';data++;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
{
// single character
com_token[len++] = *data++;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
for (;!ISWHITESPACE(*data);data++)
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = *data;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
COM_ParseToken_QuakeC
Parse a token out of a string
+Writes the token and its strlen to the com_token and com_token_len globals.
==============
*/
-int COM_ParseToken_QuakeC(const char **datapointer, qbool returnnewline)
+qbool COM_ParseToken_QuakeC(const char **datapointer, qbool returnnewline)
{
int len;
int c;
const char *data = *datapointer;
- len = 0;
- com_token[0] = 0;
+ com_token_len = len = 0;
+ com_token[0] = '\0';
if (!data)
{
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = c;
}
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
if (*data == quote)
data++;
*datapointer = data;
{
// translate Mac line ending to UNIX
com_token[len++] = '\n';data++;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
{
// single character
com_token[len++] = *data++;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
for (;!ISWHITESPACE(*data) && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = *data;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
COM_ParseToken_VM_Tokenize
Parse a token out of a string
+Writes the token and its strlen to the com_token and com_token_len globals.
==============
*/
-int COM_ParseToken_VM_Tokenize(const char **datapointer, qbool returnnewline)
+qbool COM_ParseToken_VM_Tokenize(const char **datapointer, qbool returnnewline)
{
int len;
int c;
const char *data = *datapointer;
- len = 0;
- com_token[0] = 0;
+ com_token_len = len = 0;
+ com_token[0] = '\0';
if (!data)
{
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = c;
}
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
if (*data == quote)
data++;
*datapointer = data;
{
// translate Mac line ending to UNIX
com_token[len++] = '\n';data++;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
{
// single character
com_token[len++] = *data++;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
for (;!ISWHITESPACE(*data) && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = *data;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
return true;
}
COM_ParseToken_Console
Parse a token out of a string, behaving like the qwcl console
+Writes the token and its strlen to the com_token and com_token_len globals.
==============
*/
-int COM_ParseToken_Console(const char **datapointer)
+qbool COM_ParseToken_Console(const char **datapointer)
{
int len;
const char *data = *datapointer;
- len = 0;
- com_token[0] = 0;
+ com_token_len = len = 0;
+ com_token[0] = '\0';
if (!data)
{
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = *data;
}
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
if (*data == '\"')
data++;
*datapointer = data;
for (;!ISWHITESPACE(*data);data++)
if (len < (int)sizeof(com_token) - 1)
com_token[len++] = *data;
- com_token[len] = 0;
+ com_token[len] = '\0';
+ com_token_len = len;
*datapointer = data;
}
buffer[buffersize - 1] = '\0';
// we could be inside Con_Printf
if (result < 0)
- Sys_Printf("dpvsnprintf: output error, buffer size %zu\n", buffersize);
+ Sys_Printf("dpvsnprintf: output error, buffer size %lu\n", (unsigned long)buffersize);
else
- Sys_Printf("dpvsnprintf: truncated to %zu bytes: \"%s\"\n", buffersize - 1, buffer);
+ Sys_Printf("dpvsnprintf: truncated to %lu bytes: \"%s\"\n", (unsigned long)buffersize - 1, buffer);
return -1;
}
//======================================
-void COM_ToLowerString (const char *in, char *out, size_t size_out)
+size_t COM_ToLowerString(const char *in, char *out, size_t size_out)
{
+ const char *out_start = out;
+
if (size_out == 0)
- return;
+ return 0;
if(utf8_enable.integer)
{
Uchar ch = u8_getchar_utf8_enabled(in, &in);
ch = u8_tolower(ch);
n = u8_fromchar(ch, out, size_out);
+ out += n; // before the break so the return is correct
if(n <= 0)
break;
- out += n;
size_out -= n;
}
- return;
+ return out - out_start;
}
while (*in && size_out > 1)
size_out--;
}
*out = '\0';
+ return out - out_start;
}
-void COM_ToUpperString (const char *in, char *out, size_t size_out)
+size_t COM_ToUpperString(const char *in, char *out, size_t size_out)
{
+ const char *out_start = out;
+
if (size_out == 0)
- return;
+ return 0;
if(utf8_enable.integer)
{
Uchar ch = u8_getchar_utf8_enabled(in, &in);
ch = u8_toupper(ch);
n = u8_fromchar(ch, out, size_out);
+ out += n; // before the break so the return is correct
if(n <= 0)
break;
- out += n;
size_out -= n;
}
- return;
+ return out - out_start;
}
while (*in && size_out > 1)
size_out--;
}
*out = '\0';
+ return out - out_start;
}
int COM_StringBeginsWith(const char *s, const char *match)
If escape_carets is true, the resulting string will be safe for printing. If
escape_carets is false, the function will just strip color codes (for logging
for example).
+Returns the number of bytes written to the *out buffer excluding the \0 terminator.
-If the output buffer size did not suffice for converting, the function returns
-FALSE. Generally, if escape_carets is false, the output buffer needs
+If the output buffer size did not suffice for converting, the function returns 0.
+Generally, if escape_carets is false, the output buffer needs
strlen(str)+1 bytes, and if escape_carets is true, it can need strlen(str)*1.5+2
bytes. In any case, the function makes sure that the resulting string is
zero terminated.
all characters until the zero terminator.
============
*/
-qbool
-COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qbool escape_carets)
+size_t COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qbool escape_carets)
{
-#define APPEND(ch) do { if(--size_out) { *out++ = (ch); } else { *out++ = 0; return false; } } while(0)
+#define APPEND(ch) do { if(--size_out) { *out++ = (ch); } else { *out++ = 0; return 0; } } while(0)
+
+ const char *out_start = out;
const char *end = size_in ? (in + size_in) : NULL;
+
if(size_out < 1)
- return false;
+ return 0;
for(;;)
{
switch((in == end) ? 0 : *in)
{
case 0:
- *out++ = 0;
- return true;
+ *out = '\0';
+ return out - out_start;
case STRING_COLOR_TAG:
++in;
switch((in == end) ? 0 : *in)
// finish the code by appending another caret when escaping
if(escape_carets)
APPEND(STRING_COLOR_TAG);
- *out++ = 0;
- return true;
+ *out = '\0';
+ return out - out_start;
case STRING_COLOR_TAG: // escaped ^
APPEND(STRING_COLOR_TAG);
// append a ^ twice when escaping
#ifdef WIN32
// memccpy() is standard in POSIX.1-2001, POSIX.1-2008, SVr4, 4.3BSD, C23.
// Microsoft supports it, but apparently complains if we use it.
- #pragma warning(disable : 4996)
+ #undef memccpy
+ #define memccpy _memccpy
#endif
/** Chain-copies a string with truncation and efficiency (compared to strlcat()).
if (p)
return p - 1;
end[-1] = '\0';
- Con_Printf(CON_WARN "%s: src string unterminated or truncated to %zu bytes: \"%s\"\n", __func__, dst == end ? 0 : (end - dst) - 1, dst);
+ Con_Printf(CON_WARN "%s: src string unterminated or truncated to %lu bytes: \"%s\"\n", __func__, (unsigned long)(dst == end ? 0 : (end - dst) - 1), dst);
return end;
}
* Returns a pointer to the \0 terminator. Guarantees \0 termination.
* Compared to ustr2stp(): truncates and warns on overflow.
*/
-char *dp_ustr2stp(char *dst, size_t dsize, const char *src, size_t ssize)
+char *dp_ustr2stp(char *dst, size_t dsize, const char *src, size_t slen)
{
- if (ssize >= dsize)
+ if (slen >= dsize)
{
- ssize = dsize - 1;
- Con_Printf(CON_WARN "%s: src string truncated to %zu bytes: \"%.*s\"\n", __func__, ssize, (int)ssize, src);
+ slen = dsize - 1;
+ Con_Printf(CON_WARN "%s: src string truncated to %lu bytes: \"%.*s\"\n", __func__, (unsigned long)slen, (int)slen, src);
}
- memcpy(dst, src, ssize);
- dst[ssize] = '\0';
- return &dst[ssize];
+ memcpy(dst, src, slen);
+ dst[slen] = '\0';
+ return &dst[slen];
}
/** Copies a string, like strlcpy() but with a better return: the number of bytes copied
if (p)
return (p - 1) - dst;
dst[dsize - 1] = '\0';
- Con_Printf(CON_WARN "%s:%u: src string unterminated or truncated to %zu bytes: \"%s\"\n", func, line, dsize - 1, dst);
+ Con_Printf(CON_WARN "%s:%u: src string unterminated or truncated to %lu bytes: \"%s\"\n", func, line, (unsigned long)dsize - 1, dst);
return dsize - 1;
}
*/
size_t dp__strlcat(char *dst, const char *src, size_t dsize, const char *func, unsigned line)
{
- char *p = (char *)memchr(dst, '\0', dsize) ?: dst;
- size_t offset = p - dst;
+ size_t offset;
+ char *p = (char *)memchr(dst, '\0', dsize);
+ if (!p)
+ p = dst;
+ offset = p - dst;
return dp__strlcpy(p, src, dsize - offset, func, line) + offset;
}
projects / xonotic / darkplaces.git / blobdiff