X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=95043325e40be71f476bcb99c8220018dee5c347;hb=f0759ed4221a432267e456d6862000cd55775504;hp=6363ad1e2fa39998754c67ad5d00a557d7c4fcb9;hpb=2414147e45b122da0df7a3c56dfc20741037179c;p=xonotic%2Fdarkplaces.git diff --git a/common.c b/common.c index 6363ad1e..95043325 100644 --- a/common.c +++ b/common.c @@ -219,7 +219,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) @@ -339,7 +339,7 @@ char *MSG_ReadString (void) { static char string[2048]; int l,c; - for (l = 0;l < sizeof(string) - 1 && (c = MSG_ReadChar()) != -1 && c != 0;l++) + for (l = 0;l < (int) sizeof(string) - 1 && (c = MSG_ReadChar()) != -1 && c != 0;l++) string[l] = c; string[l] = 0; return string; @@ -353,7 +353,7 @@ int MSG_ReadBytes (int numbytes, unsigned char *out) return l; } -// used by server (always latest dpprotocol) +// used by server (always latest PROTOCOL_DARKPLACES) float MSG_ReadDPCoord (void) { return (signed short) MSG_ReadLittleShort(); @@ -362,9 +362,9 @@ float MSG_ReadDPCoord (void) // 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) 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); @@ -425,17 +425,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) @@ -506,7 +498,7 @@ COM_ParseToken Parse a token out of a string ============== */ -int COM_ParseToken (const char **datapointer) +int COM_ParseToken(const char **datapointer, int returnnewline) { int c; int len; @@ -523,7 +515,7 @@ int COM_ParseToken (const char **datapointer) // skip whitespace skipwhite: - while ((c = *data) <= ' ') + while ((c = *data) <= ' ' && (c != '\n' || !returnnewline)) { if (c == 0) { @@ -534,15 +526,26 @@ skipwhite: data++; } -// skip // comments - if (c=='/' && data[1] == '/') + // check if it's a comment + if (c == '/') { - while (*data && *data != '\n') - data++; - goto skipwhite; + // skip // comments + if (data[1] == '/') + { + while (*data && *data != '\n') + data++; + goto skipwhite; + } + // skip /* comments + if (data[1] == '*') + { + while (*data && (*data != '*' || data[1] != '/')) + data++; + data+=2; + goto skipwhite; + } } - // handle quoted strings specially if (c == '\"') { @@ -550,7 +553,7 @@ skipwhite: while (1) { c = *data++; - if (c=='\"' || !c) + if (c == '\"' || !c) { com_token[len] = 0; *datapointer = data; @@ -562,7 +565,7 @@ skipwhite: } // parse single characters - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') + if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n') { com_token[len] = c; len++; @@ -578,7 +581,7 @@ skipwhite: data++; len++; c = *data; - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') + if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';') break; } while (c>32); @@ -587,6 +590,81 @@ skipwhite: return true; } +/* +============== +COM_ParseTokenConsole + +Parse a token out of a string, behaving like the qwcl console +============== +*/ +int COM_ParseTokenConsole(const char **datapointer) +{ + int c; + int len; + const char *data = *datapointer; + + len = 0; + com_token[0] = 0; + + if (!data) + { + *datapointer = NULL; + return false; + } + +// skip whitespace +skipwhite: + while ((c = *data) <= ' ') + { + if (c == 0) + { + // end of file + *datapointer = NULL; + return false; + } + data++; + } + + // skip // comments + if (c == '/' && data[1] == '/') + { + while (*data && *data != '\n') + data++; + goto skipwhite; + } + +// handle quoted strings specially + if (c == '\"') + { + data++; + while (1) + { + c = *data++; + if (c == '\"' || !c) + { + com_token[len] = 0; + *datapointer = data; + return true; + } + com_token[len] = c; + len++; + } + } + +// parse a regular word + do + { + com_token[len] = c; + data++; + len++; + c = *data; + } while (c>32); + + com_token[len] = 0; + *datapointer = data; + return true; +} + /* ================ @@ -665,26 +743,40 @@ 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; - else if (strstr(name, "nexiuz")) - gamemode = GAME_NEXIUZ; + else if (strstr(name, "nexuiz")) + gamemode = GAME_NEXUIZ; else if (strstr(name, "nehahra")) gamemode = GAME_NEHAHRA; else if (strstr(name, "hipnotic")) gamemode = GAME_HIPNOTIC; else if (strstr(name, "rogue")) gamemode = GAME_ROGUE; + else if (strstr(name, "gvb2")) + gamemode = GAME_GOODVSBAD2; + else if (strstr(name, "teu")) + 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 gamemode = GAME_NORMAL; if (COM_CheckParm ("-transfusion")) gamemode = GAME_TRANSFUSION; - else if (COM_CheckParm ("-nexiuz")) - gamemode = GAME_NEXIUZ; + else if (COM_CheckParm ("-nexuiz")) + gamemode = GAME_NEXUIZ; else if (COM_CheckParm ("-nehahra")) gamemode = GAME_NEHAHRA; else if (COM_CheckParm ("-hipnotic")) @@ -693,6 +785,20 @@ void COM_InitGameType (void) gamemode = GAME_ROGUE; else if (COM_CheckParm ("-quake")) gamemode = GAME_NORMAL; + else if (COM_CheckParm ("-goodvsbad2")) + gamemode = GAME_GOODVSBAD2; + else if (COM_CheckParm ("-teu")) + 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; switch(gamemode) { @@ -712,14 +818,42 @@ void COM_InitGameType (void) gamename = "DarkPlaces-Nehahra"; gamedirname = "nehahra"; break; - case GAME_NEXIUZ: - gamename = "Nexiuz"; + case GAME_NEXUIZ: + gamename = "Nexuiz"; gamedirname = "data"; break; case GAME_TRANSFUSION: gamename = "Transfusion"; gamedirname = "transfusion"; break; + case GAME_GOODVSBAD2: + gamename = "GoodVs.Bad2"; + gamedirname = "rts"; + break; + case GAME_TEU: + gamename = "TheEvilUnleashed"; + gamedirname = "baseteu"; + break; + case GAME_BATTLEMECH: + gamename = "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; default: Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode); break; @@ -767,6 +901,7 @@ void COM_Init (void) Mathlib_Init(); FS_Init (); + Con_InitLogging(); COM_CheckRegistered (); COM_InitGameType(); @@ -792,7 +927,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; @@ -800,28 +935,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) @@ -831,3 +975,206 @@ int COM_StringBeginsWith(const char *s, const char *match) return false; 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) +{ + static char value [256]; + char crt_key [256]; + size_t value_ind, key_ind; + char c; + + if (*infostring++ != '\\') + return NULL; + + value_ind = 0; + for (;;) + { + key_ind = 0; + + // Get the key name + for (;;) + { + c = *infostring++; + + if (c == '\0') + return NULL; + if (c == '\\' || key_ind == sizeof (crt_key) - 1) + { + crt_key[key_ind] = '\0'; + break; + } + + crt_key[key_ind++] = c; + } + + // If it's the key we are looking for, save it in "value" + if (!strcmp(crt_key, key)) + { + for (;;) + { + c = *infostring++; + + if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1) + { + value[value_ind] = '\0'; + return value; + } + + value[value_ind++] = c; + } + } + + // Else, skip the value + for (;;) + { + c = *infostring++; + + if (c == '\0') + return NULL; + if (c == '\\') + break; + } + } +} + + +//======================================================== +// 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 $ */ + + +// Most (all?) BSDs already have them +#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !(defined(__APPLE__) && defined(__MACH__)) + +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 */ +} + +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 // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)