X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=common.c;h=aa940a5fc01d188ca5b16721d55f8124e801301d;hb=c7d0648ddb1c2dd222b5228d126452739dbfa0b7;hp=c4461231503c32f80eb3ee79e5444b04a56618e5;hpb=ef35a088cb3ab1900acdbd5285465cd845368e79;p=xonotic%2Fdarkplaces.git diff --git a/common.c b/common.c index c4461231..aa940a5f 100644 --- a/common.c +++ b/common.c @@ -43,7 +43,7 @@ char com_cmdline[CMDLINE_LENGTH]; int gamemode; char *gamename; char *gamedirname; -char com_modname[MAX_OSPATH]; +char com_modname[MAX_OSPATH] = ""; /* @@ -54,15 +54,6 @@ char com_modname[MAX_OSPATH]; ============================================================================ */ -#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) -short (*BigShort) (short l); -short (*LittleShort) (short l); -int (*BigLong) (int l); -int (*LittleLong) (int l); -float (*BigFloat) (float l); -float (*LittleFloat) (float l); -#endif - short ShortSwap (short l) { qbyte b1,b2; @@ -73,13 +64,6 @@ short ShortSwap (short l) return (b1<<8) + b2; } -#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) -short ShortNoSwap (short l) -{ - return l; -} -#endif - int LongSwap (int l) { qbyte b1,b2,b3,b4; @@ -92,13 +76,6 @@ int LongSwap (int l) return ((int)b1<<24) + ((int)b2<<16) + ((int)b3<<8) + b4; } -#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) -int LongNoSwap (int l) -{ - return l; -} -#endif - float FloatSwap (float f) { union @@ -116,13 +93,6 @@ float FloatSwap (float f) return dat2.f; } -#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) -float FloatNoSwap (float f) -{ - return f; -} -#endif - // Extract integers from buffers @@ -219,7 +189,7 @@ void MSG_WriteString (sizebuf_t *sb, const char *s) SZ_Write (sb, s, strlen(s)+1); } -// used by server (always latest dpprotocol) +// used by server (always latest PROTOCOL_DARKPLACES) void MSG_WriteDPCoord (sizebuf_t *sb, float f) { if (f >= 0) @@ -353,18 +323,12 @@ int MSG_ReadBytes (int numbytes, unsigned char *out) return l; } -// used by server (always latest dpprotocol) -float MSG_ReadDPCoord (void) -{ - return (signed short) MSG_ReadLittleShort(); -} - // used by client float MSG_ReadCoord (void) { - if (dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3) + if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5) return (signed short) MSG_ReadLittleShort(); - else if (dpprotocol == DPPROTOCOL_VERSION1) + else if (cl.protocol == PROTOCOL_DARKPLACES1) return MSG_ReadLittleFloat(); else return MSG_ReadLittleShort() * (1.0f/8.0f); @@ -410,7 +374,7 @@ void *SZ_GetSpace (sizebuf_t *buf, int length) Host_Error ("SZ_GetSpace: %i is > full buffer size\n", length); buf->overflowed = true; - Con_Printf ("SZ_GetSpace: overflow\n"); + Con_Print("SZ_GetSpace: overflow\n"); SZ_Clear (buf); } @@ -425,17 +389,9 @@ void SZ_Write (sizebuf_t *buf, const void *data, int length) memcpy (SZ_GetSpace(buf,length),data,length); } -void SZ_Print (sizebuf_t *buf, const char *data) -{ - int len; - len = strlen(data)+1; - -// byte * cast to keep VC++ happy - if (buf->data[buf->cursize-1]) - memcpy ((qbyte *)SZ_GetSpace(buf, len),data,len); // no trailing 0 - else - memcpy ((qbyte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0 -} +// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my +// attention, it has been eradicated from here, its only (former) use in +// all of darkplaces. static char *hexchar = "0123456789ABCDEF"; void Com_HexDumpToConsole(const qbyte *data, int size) @@ -484,7 +440,7 @@ void Com_HexDumpToConsole(const qbyte *data, int size) if (cur >= flushpointer || i >= size) { *cur++ = 0; - Con_Printf("%s", text); + Con_Print(text); cur = text; } } @@ -508,7 +464,6 @@ Parse a token out of a string */ int COM_ParseToken(const char **datapointer, int returnnewline) { - int c; int len; const char *data = *datapointer; @@ -523,78 +478,150 @@ int COM_ParseToken(const char **datapointer, int returnnewline) // skip whitespace skipwhite: - while ((c = *data) <= ' ' && (c != '\n' || !returnnewline)) + for (;*data <= ' ' && (*data != '\n' || !returnnewline);data++) { - if (c == 0) + if (*data == 0) { // end of file *datapointer = NULL; return false; } - data++; } - // check if it's a comment - if (c == '/') + if (data[0] == '/' && data[1] == '/') + { + // comment + while (*data && *data != '\n') + data++; + goto skipwhite; + } + else if (data[0] == '/' && data[1] == '*') { - // skip // comments - if (data[1] == '/') + // comment + data++; + while (*data && (data[0] != '*' || data[1] != '/')) + data++; + data += 2; + goto skipwhite; + } + else if (*data == '\"') + { + // quoted string + for (data++;*data != '\"';data++) { - while (*data && *data != '\n') - data++; - goto skipwhite; + if (!*data || len >= (int)sizeof(com_token) - 1) + { + com_token[0] = 0; + *datapointer = NULL; + return false; + } + com_token[len++] = *data; } - // skip /* comments - if (data[1] == '*') + com_token[len] = 0; + *datapointer = data+1; + return true; + } + else if (*data == '\n' || *data == '{' || *data == '}' || *data == ')' || *data == '(' || *data == ']' || *data == '[' || *data == '\'' || *data == ':' || *data == ',' || *data == ';') + { + // single character + com_token[len++] = *data++; + com_token[len] = 0; + *datapointer = data; + return true; + } + else + { + // regular word + for (;*data > ' ' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != '\'' && *data != ':' && *data != ',' && *data != ';';data++) { - while (*data && *data != '*' && data[1] != '/') - data++; - goto skipwhite; + if (len >= (int)sizeof(com_token) - 1) + { + com_token[0] = 0; + *datapointer = NULL; + return false; + } + com_token[len++] = *data; } + com_token[len] = 0; + *datapointer = data; + return true; + } +} + +/* +============== +COM_ParseTokenConsole + +Parse a token out of a string, behaving like the qwcl console +============== +*/ +int COM_ParseTokenConsole(const char **datapointer) +{ + int len; + const char *data = *datapointer; + + len = 0; + com_token[0] = 0; + + if (!data) + { + *datapointer = NULL; + return false; } -// handle quoted strings specially - if (c == '\"') +// skip whitespace +skipwhite: + for (;*data <= ' ';data++) { - data++; - while (1) + if (*data == 0) { - c = *data++; - if (c == '\"' || !c) - { - com_token[len] = 0; - *datapointer = data; - return true; - } - com_token[len] = c; - len++; + // end of file + *datapointer = NULL; + return false; } } -// parse single characters - if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n') + if (*data == '/' && data[1] == '/') + { + // comment + while (*data && *data != '\n') + data++; + goto skipwhite; + } + else if (*data == '\"') { - com_token[len] = c; - len++; + // quoted string + for (data++;*data != '\"';data++) + { + if (!*data || len >= (int)sizeof(com_token) - 1) + { + com_token[0] = 0; + *datapointer = NULL; + return false; + } + com_token[len++] = *data; + } com_token[len] = 0; *datapointer = data+1; return true; } - -// parse a regular word - do + else { - com_token[len] = c; - data++; - len++; - c = *data; - if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';') - break; - } while (c>32); - - com_token[len] = 0; - *datapointer = data; - return true; + // regular word + for (;*data > ' ';data++) + { + if (len >= (int)sizeof(com_token) - 1) + { + com_token[0] = 0; + *datapointer = NULL; + return false; + } + com_token[len++] = *data; + } + com_token[len] = 0; + *datapointer = data; + return true; + } } @@ -638,14 +665,14 @@ void COM_CheckRegistered (void) if (!FS_FileExists("gfx/pop.lmp")) { if (fs_modified) - Con_Printf ("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); + Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); else - Con_Printf ("Playing shareware version.\n"); + Con_Print("Playing shareware version.\n"); return; } Cvar_Set ("registered", "1"); - Con_Printf ("Playing registered version.\n"); + Con_Print("Playing registered version.\n"); } @@ -675,8 +702,8 @@ void COM_InitArgv (void) void COM_InitGameType (void) { char name[MAX_OSPATH]; - FS_StripExtension(com_argv[0], name); - COM_ToLowerString(name, name); + FS_StripExtension (com_argv[0], name, sizeof (name)); + COM_ToLowerString (name, name, sizeof (name)); if (strstr(name, "transfusion")) gamemode = GAME_TRANSFUSION; @@ -694,6 +721,16 @@ void COM_InitGameType (void) gamemode = GAME_TEU; else if (strstr(name, "battlemech")) gamemode = GAME_BATTLEMECH; + else if (strstr(name, "zymotic")) + gamemode = GAME_ZYMOTIC; + else if (strstr(name, "fniggium")) + gamemode = GAME_FNIGGIUM; + else if (strstr(name, "setheral")) + gamemode = GAME_SETHERAL; + else if (strstr(name, "som")) + gamemode = GAME_SOM; + else if (strstr(name, "tenebrae")) + gamemode = GAME_TENEBRAE; else gamemode = GAME_NORMAL; @@ -715,6 +752,16 @@ void COM_InitGameType (void) gamemode = GAME_TEU; else if (COM_CheckParm ("-battlemech")) gamemode = GAME_BATTLEMECH; + else if (COM_CheckParm ("-zymotic")) + gamemode = GAME_ZYMOTIC; + else if (COM_CheckParm ("-fniggium")) + gamemode = GAME_FNIGGIUM; + else if (COM_CheckParm ("-setheral")) + gamemode = GAME_SETHERAL; + else if (COM_CheckParm ("-som")) + gamemode = GAME_SOM; + else if (COM_CheckParm ("-tenebrae")) + gamemode = GAME_TENEBRAE; switch(gamemode) { @@ -740,7 +787,7 @@ void COM_InitGameType (void) break; case GAME_TRANSFUSION: gamename = "Transfusion"; - gamedirname = "transfusion"; + gamedirname = "basetf"; break; case GAME_GOODVSBAD2: gamename = "GoodVs.Bad2"; @@ -748,11 +795,31 @@ void COM_InitGameType (void) break; case GAME_TEU: gamename = "TheEvilUnleashed"; - gamedirname = "teu"; + gamedirname = "baseteu"; break; case GAME_BATTLEMECH: gamename = "Battlemech"; - gamedirname = "battlemech"; + gamedirname = "base"; + break; + case GAME_ZYMOTIC: + gamename = "Zymotic"; + gamedirname = "data"; + break; + case GAME_FNIGGIUM: + gamename = "Fniggium"; + gamedirname = "data"; + break; + case GAME_SETHERAL: + gamename = "Setheral"; + gamedirname = "data"; + break; + case GAME_SOM: + gamename = "Son of Man"; + gamedirname = "data"; + break; + case GAME_TENEBRAE: + gamename = "DarkPlaces-Tenebrae"; + gamedirname = "tenebrae"; break; default: Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode); @@ -771,37 +838,13 @@ COM_Init */ void COM_Init (void) { -#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) - qbyte swaptest[2] = {1,0}; - -// set the byte swapping variables in a portable manner - if ( *(short *)swaptest == 1) - { - BigShort = ShortSwap; - LittleShort = ShortNoSwap; - BigLong = LongSwap; - LittleLong = LongNoSwap; - BigFloat = FloatSwap; - LittleFloat = FloatNoSwap; - } - else - { - BigShort = ShortNoSwap; - LittleShort = ShortSwap; - BigLong = LongNoSwap; - LittleLong = LongSwap; - BigFloat = FloatNoSwap; - LittleFloat = FloatSwap; - } -#endif - Cvar_RegisterVariable (®istered); Cvar_RegisterVariable (&cmdline); Mathlib_Init(); FS_Init (); - Con_InitLogging(); + Log_Init (); COM_CheckRegistered (); COM_InitGameType(); @@ -827,7 +870,7 @@ char *va(const char *format, ...) s = string[stringindex]; stringindex = (stringindex + 1) & 7; va_start (argptr, format); - vsprintf (s, format,argptr); + vsnprintf (s, sizeof (string[0]), format,argptr); va_end (argptr); return s; @@ -835,28 +878,37 @@ char *va(const char *format, ...) //====================================== -// LordHavoc: added these because they are useful -void COM_ToLowerString(const char *in, char *out) +void COM_ToLowerString (const char *in, char *out, size_t size_out) { - while (*in) + if (size_out == 0) + return; + + while (*in && size_out > 1) { if (*in >= 'A' && *in <= 'Z') *out++ = *in++ + 'a' - 'A'; else *out++ = *in++; + size_out--; } + *out = '\0'; } -void COM_ToUpperString(const char *in, char *out) +void COM_ToUpperString (const char *in, char *out, size_t size_out) { - while (*in) + if (size_out == 0) + return; + + while (*in && size_out > 1) { if (*in >= 'a' && *in <= 'z') *out++ = *in++ + 'A' - 'a'; else *out++ = *in++; + size_out--; } + *out = '\0'; } int COM_StringBeginsWith(const char *s, const char *match) @@ -867,6 +919,64 @@ int COM_StringBeginsWith(const char *s, const char *match) return true; } +int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix) +{ + int argc, commentprefixlength; + char *tokenbufend; + const char *l; + argc = 0; + tokenbufend = tokenbuf + tokenbufsize; + l = *text; + commentprefixlength = 0; + if (commentprefix) + commentprefixlength = strlen(commentprefix); + while (*l && *l != '\n') + { + if (*l > ' ') + { + if (commentprefixlength && !strncmp(l, commentprefix, commentprefixlength)) + { + while (*l && *l != '\n') + l++; + break; + } + if (argc >= maxargc) + return -1; + argv[argc++] = tokenbuf; + if (*l == '"') + { + l++; + while (*l && *l != '"') + { + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = *l++; + } + if (*l == '"') + l++; + } + else + { + while (*l > ' ') + { + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = *l++; + } + } + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = 0; + } + else + l++; + } + if (*l == '\n') + l++; + *text = l; + return argc; +} + // written by Elric, thanks Elric! char *SearchInfostring(const char *infostring, const char *key) { @@ -890,7 +1000,7 @@ char *SearchInfostring(const char *infostring, const char *key) if (c == '\0') return NULL; - if (c == '\\') + if (c == '\\' || key_ind == sizeof (crt_key) - 1) { crt_key[key_ind] = '\0'; break; @@ -906,7 +1016,7 @@ char *SearchInfostring(const char *infostring, const char *key) { c = *infostring++; - if (c == '\0' || c == '\\') + if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1) { value[value_ind] = '\0'; return value; @@ -929,3 +1039,86 @@ char *SearchInfostring(const char *infostring, const char *key) } } + +//======================================================== +// strlcat and strlcpy, from OpenBSD + +/* + * Copyright (c) 1998 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $ */ +/* $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $ */ + + +#ifndef HAVE_STRLCAT +size_t +strlcat(char *dst, const char *src, size_t siz) +{ + register char *d = dst; + register const char *s = src; + register size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) + return(dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return(dlen + (s - src)); /* count does not include NUL */ +} +#endif // #ifndef HAVE_STRLCAT + + +#ifndef HAVE_STRLCPY +size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + register char *d = dst; + register const char *s = src; + register size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) + break; + } while (--n != 0); + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ +} + +#endif // #ifndef HAVE_STRLCPY