X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=43db21a3237c60848320995ff79055067a6d4496;hp=11778fa66f1817261e5e087c1787590d81e611c6;hb=b67992ec537cf235e37837191a6275f0d3630724;hpb=8dcce44300385b12c46d494c06aadcfa35a8bc14 diff --git a/common.c b/common.c index 11778fa6..43db21a3 100644 --- a/common.c +++ b/common.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,411 +19,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // common.c -- misc functions used in client and server -#include "quakedef.h" - -#define NUM_SAFE_ARGVS 7 - -static char *largv[MAX_NUM_ARGVS + NUM_SAFE_ARGVS + 1]; -static char *argvdummy = " "; - -static char *safeargvs[NUM_SAFE_ARGVS] = - {"-stdvid", "-nolan", "-nosound", "-nocdaudio", "-nojoy", "-nomouse", "-dibonly"}; - -cvar_t registered = {"registered","0"}; -cvar_t cmdline = {"cmdline","0", false, true}; - -qboolean com_modified; // set true if using non-id files - -qboolean proghack; - -int static_registered = 1; // only for startup check, then set - -qboolean msg_suppress_1 = 0; - -void COM_InitFilesystem (void); - -// if a packfile directory differs from this, it is assumed to be hacked -#define PAK0_COUNT 339 -#define PAK0_CRC 32981 - -char com_token[1024]; -int com_argc; -char **com_argv; - -#define CMDLINE_LENGTH 256 -char com_cmdline[CMDLINE_LENGTH]; - -qboolean standard_quake = true, rogue = false, hipnotic = false, nehahra = false; - -// this graphic needs to be in the pak file to use registered features -unsigned short pop[] = -{ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x6600,0x0000,0x0000,0x0000,0x6600,0x0000 -,0x0000,0x0066,0x0000,0x0000,0x0000,0x0000,0x0067,0x0000 -,0x0000,0x6665,0x0000,0x0000,0x0000,0x0000,0x0065,0x6600 -,0x0063,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6563 -,0x0064,0x6561,0x0000,0x0000,0x0000,0x0000,0x0061,0x6564 -,0x0064,0x6564,0x0000,0x6469,0x6969,0x6400,0x0064,0x6564 -,0x0063,0x6568,0x6200,0x0064,0x6864,0x0000,0x6268,0x6563 -,0x0000,0x6567,0x6963,0x0064,0x6764,0x0063,0x6967,0x6500 -,0x0000,0x6266,0x6769,0x6a68,0x6768,0x6a69,0x6766,0x6200 -,0x0000,0x0062,0x6566,0x6666,0x6666,0x6666,0x6562,0x0000 -,0x0000,0x0000,0x0062,0x6364,0x6664,0x6362,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0062,0x6662,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0061,0x6661,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0000,0x6500,0x0000,0x0000,0x0000 -,0x0000,0x0000,0x0000,0x0000,0x6400,0x0000,0x0000,0x0000 -}; - -/* - - -All of Quake's data access is through a hierchal file system, but the contents of the file system can be transparently merged from several sources. - -The "base directory" is the path to the directory holding the quake.exe and all game directories. The sys_* files pass this to host_init in quakeparms_t->basedir. This can be overridden with the "-basedir" command line parm to allow code debugging in a different directory. The base directory is -only used during filesystem initialization. - -The "game directory" is the first tree on the search path and directory that all generated files (savegames, screenshots, demos, config files) will be saved to. This can be overridden with the "-game" command line parameter. The game directory can never be changed while quake is executing. This is a precacution against having a malicious server instruct clients to write files over areas they shouldn't. - -The "cache directory" is only used during development to save network bandwidth, especially over ISDN / T1 lines. If there is a cache directory -specified, when a file is found by the normal search path, it will be mirrored -into the cache directory, then opened there. - - - -FIXME: -The file "parms.txt" will be read out of the game directory and appended to the current command line arguments to allow different games to initialize startup parms differently. This could be used to add a "-sspeed 22050" for the high quality sound edition. Because they are added at the end, they will not override an explicit setting on the original command line. - -*/ - -//============================================================================ - - -// ClearLink is used for new headnodes -void ClearLink (link_t *l) -{ - l->prev = l->next = l; -} - -void RemoveLink (link_t *l) -{ - l->next->prev = l->prev; - l->prev->next = l->next; -} - -void InsertLinkBefore (link_t *l, link_t *before) -{ - l->next = before; - l->prev = before->prev; - l->prev->next = l; - l->next->prev = l; -} -void InsertLinkAfter (link_t *l, link_t *after) -{ - l->next = after->next; - l->prev = after; - l->prev->next = l; - l->next->prev = l; -} - -/* -============================================================================ - - LIBRARY REPLACEMENT FUNCTIONS - -============================================================================ -*/ - -/* -void Q_memset (void *dest, int fill, int count) -{ - int i; - - if ( (((long)dest | count) & 3) == 0) - { - count >>= 2; - fill = fill | (fill<<8) | (fill<<16) | (fill<<24); - for (i=0 ; i>=2; - for (i=0 ; i +#include +#ifndef WIN32 +#include +#endif - if (!n--) - return 0; // strings are equal until end point - - if (c1 != c2) - { - if (c1 >= 'a' && c1 <= 'z') - c1 -= ('a' - 'A'); - if (c2 >= 'a' && c2 <= 'z') - c2 -= ('a' - 'A'); - if (c1 != c2) - return -1; // strings not equal - } - if (!c1) - return 0; // strings are equal -// s1++; -// s2++; - } - - return -1; -} +#include "quakedef.h" -int Q_strcasecmp (char *s1, char *s2) -{ - return Q_strncasecmp (s1, s2, 99999); -} -/* -int Q_atoi (char *str) -{ - int val; - int sign; - int c; - - if (*str == '-') - { - sign = -1; - str++; - } - else - sign = 1; - - val = 0; +cvar_t registered = {0, "registered","0"}; +cvar_t cmdline = {0, "cmdline","0"}; -// -// check for hex -// - if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X') ) - { - str += 2; - while (1) - { - c = *str++; - if (c >= '0' && c <= '9') - val = (val<<4) + c - '0'; - else if (c >= 'a' && c <= 'f') - val = (val<<4) + c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - val = (val<<4) + c - 'A' + 10; - else - return val*sign; - } - } - -// -// check for character -// - if (str[0] == '\'') - { - return sign * str[1]; - } - -// -// assume decimal -// - while (1) - { - c = *str++; - if (c <'0' || c > '9') - return val*sign; - val = val*10 + c - '0'; - } - - return 0; -} +extern qboolean fs_modified; // set true if using non-id files +char com_token[1024]; +int com_argc; +const char **com_argv; -float Q_atof (char *str) -{ - double val; - int sign; - int c; - int decimal, total; - - if (*str == '-') - { - sign = -1; - str++; - } - else - sign = 1; - - val = 0; +// LordHavoc: made commandline 1024 characters instead of 256 +#define CMDLINE_LENGTH 1024 +char com_cmdline[CMDLINE_LENGTH]; -// -// check for hex -// - if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X') ) - { - str += 2; - while (1) - { - c = *str++; - if (c >= '0' && c <= '9') - val = (val*16) + c - '0'; - else if (c >= 'a' && c <= 'f') - val = (val*16) + c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - val = (val*16) + c - 'A' + 10; - else - return val*sign; - } - } - -// -// check for character -// - if (str[0] == '\'') - { - return sign * str[1]; - } - -// -// assume decimal -// - decimal = -1; - total = 0; - while (1) - { - c = *str++; - if (c == '.') - { - decimal = total; - continue; - } - if (c <'0' || c > '9') - break; - val = val*10 + c - '0'; - total++; - } +int gamemode; +char *gamename; +char *gamedirname; +char com_modname[MAX_OSPATH]; - if (decimal == -1) - return val*sign; - while (total > decimal) - { - val /= 10; - total--; - } - - return val*sign; -} -*/ /* ============================================================================ @@ -433,7 +54,7 @@ float Q_atof (char *str) ============================================================================ */ -#ifndef WIN32 +#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) short (*BigShort) (short l); short (*LittleShort) (short l); int (*BigLong) (int l); @@ -444,7 +65,7 @@ float (*LittleFloat) (float l); short ShortSwap (short l) { - byte b1,b2; + qbyte b1,b2; b1 = l&255; b2 = (l>>8)&255; @@ -452,14 +73,16 @@ 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) { - byte b1,b2,b3,b4; + qbyte b1,b2,b3,b4; b1 = l&255; b2 = (l>>8)&255; @@ -469,20 +92,22 @@ 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 { float f; - byte b[4]; + qbyte b[4]; } dat1, dat2; - - + + dat1.f = f; dat2.b[0] = dat1.b[3]; dat2.b[1] = dat1.b[2]; @@ -491,10 +116,36 @@ 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 + +unsigned int BuffBigLong (const qbyte *buffer) +{ + return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; +} + +unsigned short BuffBigShort (const qbyte *buffer) +{ + return (buffer[0] << 8) | buffer[1]; +} + +unsigned int BuffLittleLong (const qbyte *buffer) +{ + return (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; +} + +unsigned short BuffLittleShort (const qbyte *buffer) +{ + return (buffer[1] << 8) | buffer[0]; +} + /* ============================================================================== @@ -511,12 +162,7 @@ Handles byte ordering and avoids alignment errors void MSG_WriteChar (sizebuf_t *sb, int c) { - byte *buf; - -//#ifdef PARANOID -// if (c < -128 || c > 127) -// Sys_Error ("MSG_WriteChar: range error"); -//#endif + qbyte *buf; buf = SZ_GetSpace (sb, 1); buf[0] = c; @@ -524,12 +170,7 @@ void MSG_WriteChar (sizebuf_t *sb, int c) void MSG_WriteByte (sizebuf_t *sb, int c) { - byte *buf; - -//#ifdef PARANOID -// if (c < 0 || c > 255) -// Sys_Error ("MSG_WriteByte: range error"); -//#endif + qbyte *buf; buf = SZ_GetSpace (sb, 1); buf[0] = c; @@ -537,12 +178,7 @@ void MSG_WriteByte (sizebuf_t *sb, int c) void MSG_WriteShort (sizebuf_t *sb, int c) { - byte *buf; - -//#ifdef PARANOID -// if (c < ((short)0x8000) || c > (short)0x7fff) -// Sys_Error ("MSG_WriteShort: range error"); -//#endif + qbyte *buf; buf = SZ_GetSpace (sb, 2); buf[0] = c&0xff; @@ -551,8 +187,8 @@ void MSG_WriteShort (sizebuf_t *sb, int c) void MSG_WriteLong (sizebuf_t *sb, int c) { - byte *buf; - + qbyte *buf; + buf = SZ_GetSpace (sb, 4); buf[0] = c&0xff; buf[1] = (c>>8)&0xff; @@ -567,15 +203,15 @@ void MSG_WriteFloat (sizebuf_t *sb, float f) float f; int l; } dat; - - + + dat.f = f; dat.l = LittleLong (dat.l); - + SZ_Write (sb, &dat.l, 4); } -void MSG_WriteString (sizebuf_t *sb, char *s) +void MSG_WriteString (sizebuf_t *sb, const char *s) { if (!s) SZ_Write (sb, "", 1); @@ -583,21 +219,37 @@ void MSG_WriteString (sizebuf_t *sb, char *s) SZ_Write (sb, s, strlen(s)+1); } -void MSG_WriteCoord (sizebuf_t *sb, float f) +// used by server (always latest PROTOCOL_DARKPLACES) +void MSG_WriteDPCoord (sizebuf_t *sb, float f) +{ + if (f >= 0) + MSG_WriteShort (sb, (int)(f + 0.5f)); + else + MSG_WriteShort (sb, (int)(f - 0.5f)); +} + +void MSG_WritePreciseAngle (sizebuf_t *sb, float f) { - MSG_WriteShort (sb, (int)(f*8)); + if (f >= 0) + MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535); + else + MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) - 0.5f) & 65535); } +// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem void MSG_WriteAngle (sizebuf_t *sb, float f) { - MSG_WriteByte (sb, ((int)f*256/360) & 255); + if (f >= 0) + MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255); + else + MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) - 0.5f) & 255); } // // reading functions // -int msg_readcount; -qboolean msg_badread; +int msg_readcount; +qboolean msg_badread; void MSG_BeginReading (void) { @@ -605,144 +257,128 @@ void MSG_BeginReading (void) msg_badread = false; } -/* -// returns -1 and sets msg_badread if no more characters are available -int MSG_ReadChar (void) +int MSG_ReadLittleShort (void) { - int c; - - // LordHavoc: minor optimization - if (msg_readcount >= net_message.cursize) -// if (msg_readcount+1 > net_message.cursize) + if (msg_readcount+2 > net_message.cursize) { msg_badread = true; return -1; } - - c = (signed char)net_message.data[msg_readcount]; - msg_readcount++; - - return c; + msg_readcount += 2; + return (short)(net_message.data[msg_readcount-2] | (net_message.data[msg_readcount-1]<<8)); } -int MSG_ReadByte (void) +int MSG_ReadBigShort (void) { - int c; - - // LordHavoc: minor optimization - if (msg_readcount >= net_message.cursize) -// if (msg_readcount+1 > net_message.cursize) + if (msg_readcount+2 > net_message.cursize) { msg_badread = true; return -1; } - - c = (unsigned char)net_message.data[msg_readcount]; - msg_readcount++; - - return c; + msg_readcount += 2; + return (short)((net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1]); } -*/ -int MSG_ReadShort (void) +int MSG_ReadLittleLong (void) { - int c; - - if (msg_readcount+2 > net_message.cursize) + if (msg_readcount+4 > net_message.cursize) { msg_badread = true; return -1; } - - c = (short)(net_message.data[msg_readcount] - + (net_message.data[msg_readcount+1]<<8)); - - msg_readcount += 2; - - return c; + msg_readcount += 4; + return net_message.data[msg_readcount-4] | (net_message.data[msg_readcount-3]<<8) | (net_message.data[msg_readcount-2]<<16) | (net_message.data[msg_readcount-1]<<24); } -int MSG_ReadLong (void) +int MSG_ReadBigLong (void) { - int c; - if (msg_readcount+4 > net_message.cursize) { msg_badread = true; return -1; } - - c = net_message.data[msg_readcount] - + (net_message.data[msg_readcount+1]<<8) - + (net_message.data[msg_readcount+2]<<16) - + (net_message.data[msg_readcount+3]<<24); - msg_readcount += 4; - - return c; + return (net_message.data[msg_readcount-4]<<24) + (net_message.data[msg_readcount-3]<<16) + (net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1]; } -float MSG_ReadFloat (void) +float MSG_ReadLittleFloat (void) { union { - byte b[4]; - float f; - int l; + float f; + int l; } dat; - - dat.b[0] = net_message.data[msg_readcount]; - dat.b[1] = net_message.data[msg_readcount+1]; - dat.b[2] = net_message.data[msg_readcount+2]; - dat.b[3] = net_message.data[msg_readcount+3]; + if (msg_readcount+4 > net_message.cursize) + { + msg_badread = true; + return -1; + } msg_readcount += 4; - - dat.l = LittleLong (dat.l); + dat.l = net_message.data[msg_readcount-4] | (net_message.data[msg_readcount-3]<<8) | (net_message.data[msg_readcount-2]<<16) | (net_message.data[msg_readcount-1]<<24); + return dat.f; +} - return dat.f; +float MSG_ReadBigFloat (void) +{ + union + { + float f; + int l; + } dat; + if (msg_readcount+4 > net_message.cursize) + { + msg_badread = true; + return -1; + } + msg_readcount += 4; + dat.l = (net_message.data[msg_readcount-4]<<24) | (net_message.data[msg_readcount-3]<<16) | (net_message.data[msg_readcount-2]<<8) | net_message.data[msg_readcount-1]; + return dat.f; } char *MSG_ReadString (void) { - static char string[2048]; - int l,c; - - l = 0; - do - { - c = MSG_ReadChar (); - if (c == -1 || c == 0) - break; + static char string[2048]; + int l,c; + for (l = 0;l < (int) sizeof(string) - 1 && (c = MSG_ReadChar()) != -1 && c != 0;l++) string[l] = c; - l++; - } while (l < sizeof(string)-1); - string[l] = 0; - return string; } -/* -float MSG_ReadCoord (void) +int MSG_ReadBytes (int numbytes, unsigned char *out) { - return MSG_ReadShort() * (1.0f/8.0f); + int l, c; + for (l = 0;l < numbytes && (c = MSG_ReadChar()) != -1;l++) + out[l] = c; + return l; } -float MSG_ReadAngle (void) +// used by server (always latest PROTOCOL_DARKPLACES) +float MSG_ReadDPCoord (void) { - return MSG_ReadChar() * (360.0f/256.0f); + return (signed short) MSG_ReadLittleShort(); } -*/ +// used by client +float MSG_ReadCoord (void) +{ + if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4) + return (signed short) MSG_ReadLittleShort(); + else if (cl.protocol == PROTOCOL_DARKPLACES1) + return MSG_ReadLittleFloat(); + else + return MSG_ReadLittleShort() * (1.0f/8.0f); +} //=========================================================================== -void SZ_Alloc (sizebuf_t *buf, int startsize) +void SZ_Alloc (sizebuf_t *buf, int startsize, const char *name) { if (startsize < 256) startsize = 256; - buf->data = Hunk_AllocName (startsize, "sizebuf"); + buf->mempool = Mem_AllocPool(name); + buf->data = Mem_Alloc(buf->mempool, startsize); buf->maxsize = startsize; buf->cursize = 0; } @@ -750,9 +386,9 @@ void SZ_Alloc (sizebuf_t *buf, int startsize) void SZ_Free (sizebuf_t *buf) { -// Z_Free (buf->data); -// buf->data = NULL; -// buf->maxsize = 0; + Mem_FreePool(&buf->mempool); + buf->data = NULL; + buf->maxsize = 0; buf->cursize = 0; } @@ -763,43 +399,92 @@ void SZ_Clear (sizebuf_t *buf) void *SZ_GetSpace (sizebuf_t *buf, int length) { - void *data; - + void *data; + if (buf->cursize + length > buf->maxsize) { if (!buf->allowoverflow) - Sys_Error ("SZ_GetSpace: overflow without allowoverflow set - use -zone on the commandline for more zone memory, default: 512k (quake original default was 48k)"); - + Host_Error ("SZ_GetSpace: overflow without allowoverflow set\n"); + if (length > buf->maxsize) - Sys_Error ("SZ_GetSpace: %i is > full buffer size", length); - + Host_Error ("SZ_GetSpace: %i is > full buffer size\n", length); + buf->overflowed = true; - Con_Printf ("SZ_GetSpace: overflow"); - SZ_Clear (buf); + Con_Printf ("SZ_GetSpace: overflow\n"); + SZ_Clear (buf); } data = buf->data + buf->cursize; buf->cursize += length; - + return data; } -void SZ_Write (sizebuf_t *buf, void *data, int length) +void SZ_Write (sizebuf_t *buf, const void *data, int length) { - memcpy (SZ_GetSpace(buf,length),data,length); + memcpy (SZ_GetSpace(buf,length),data,length); } -void SZ_Print (sizebuf_t *buf, char *data) +// 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) { - int len; - - len = strlen(data)+1; + int i, j, n; + char text[1024]; + char *cur, *flushpointer; + const qbyte *d; + cur = text; + flushpointer = text + 512; + for (i = 0;i < size;) + { + n = 16; + if (n > size - i) + n = size - i; + d = data + i; + *cur++ = hexchar[(i >> 12) & 15]; + *cur++ = hexchar[(i >> 8) & 15]; + *cur++ = hexchar[(i >> 4) & 15]; + *cur++ = hexchar[(i >> 0) & 15]; + *cur++ = ':'; + for (j = 0;j < n;j++) + { + if (j & 1) + { + *cur++ = hexchar[(d[j] >> 4) & 15] | 0x80; + *cur++ = hexchar[(d[j] >> 0) & 15] | 0x80; + } + else + { + *cur++ = hexchar[(d[j] >> 4) & 15]; + *cur++ = hexchar[(d[j] >> 0) & 15]; + } + } + for (;j < 16;j++) + { + *cur++ = ' '; + *cur++ = ' '; + } + for (j = 0;j < n;j++) + *cur++ = (d[j] >= ' ' && d[j] <= 0x7E) ? d[j] : '.'; + for (;j < 16;j++) + *cur++ = ' '; + *cur++ = '\n'; + i += n; + if (cur >= flushpointer || i >= size) + { + *cur++ = 0; + Con_Printf("%s", text); + cur = text; + } + } +} -// byte * cast to keep VC++ happy - if (buf->data[buf->cursize-1]) - memcpy ((byte *)SZ_GetSpace(buf, len),data,len); // no trailing 0 - else - memcpy ((byte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0 +void SZ_HexDumpToConsole(const sizebuf_t *buf) +{ + Com_HexDumpToConsole(buf->data, buf->cursize); } @@ -807,185 +492,172 @@ void SZ_Print (sizebuf_t *buf, char *data) /* -============ -COM_SkipPath -============ +============== +COM_ParseToken + +Parse a token out of a string +============== */ -char *COM_SkipPath (char *pathname) +int COM_ParseToken(const char **datapointer, int returnnewline) { - char *last; - - last = pathname; - while (*pathname) - { - if (*pathname=='/') - last = pathname+1; - pathname++; - } - return last; -} + int len; + const char *data = *datapointer; -/* -============ -COM_StripExtension -============ -*/ -void COM_StripExtension (char *in, char *out) -{ - while (*in && *in != '.') - *out++ = *in++; - *out = 0; -} - -/* -============ -COM_FileExtension -============ -*/ -char *COM_FileExtension (char *in) -{ - static char exten[8]; - int i; - - while (*in && *in != '.') - in++; - if (!*in) - return ""; - in++; - for (i=0 ; i<7 && *in ; i++,in++) - exten[i] = *in; - exten[i] = 0; - return exten; -} + len = 0; + com_token[0] = 0; -/* -============ -COM_FileBase -============ -*/ -void COM_FileBase (char *in, char *out) -{ - char *s, *s2; - - s = in + strlen(in) - 1; - - while (s != in && *s != '.') - s--; - - for (s2 = s ; *s2 && *s2 != '/' ; s2--) - ; - - if (s-s2 < 2) - strcpy (out,"?model?"); - else + if (!data) { - s--; - strncpy (out,s2+1, s-s2); - out[s-s2] = 0; + *datapointer = NULL; + return false; } -} - -/* -================== -COM_DefaultExtension -================== -*/ -void COM_DefaultExtension (char *path, char *extension) -{ - char *src; -// -// if path doesn't have a .EXT, append extension -// (extension should include the .) -// - src = path + strlen(path) - 1; - - while (*src != '/' && src != path) +// skip whitespace +skipwhite: + for (;*data <= ' ' && (*data != '\n' || !returnnewline);data++) { - if (*src == '.') - return; // it has an extension - src--; + if (*data == 0) + { + // end of file + *datapointer = NULL; + return false; + } } - strcat (path, extension); + if (data[0] == '/' && data[1] == '/') + { + // comment + while (*data && *data != '\n') + data++; + goto skipwhite; + } + else if (data[0] == '/' && data[1] == '*') + { + // comment + data++; + while (*data && (data[0] != '*' || data[1] != '/')) + data++; + data += 2; + goto skipwhite; + } + else if (*data == '\"') + { + // 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; + } + 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++) + { + 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_Parse +COM_ParseTokenConsole -Parse a token out of a string +Parse a token out of a string, behaving like the qwcl console ============== */ -char *COM_Parse (char *data) +int COM_ParseTokenConsole(const char **datapointer) { - int c; - int len; - + int len; + const char *data = *datapointer; + len = 0; com_token[0] = 0; - + if (!data) - return NULL; - + { + *datapointer = NULL; + return false; + } + // skip whitespace skipwhite: - while ( (c = *data) <= ' ') + for (;*data <= ' ';data++) { - if (c == 0) - return NULL; // end of file; - data++; + if (*data == 0) + { + // end of file + *datapointer = NULL; + return false; + } } - -// skip // comments - if (c=='/' && data[1] == '/') + + if (*data == '/' && data[1] == '/') { + // comment while (*data && *data != '\n') data++; goto skipwhite; } - - -// handle quoted strings specially - if (c == '\"') + else if (*data == '\"') { - data++; - while (1) + // quoted string + for (data++;*data != '\"';data++) { - c = *data++; - if (c=='\"' || !c) + if (!*data || len >= (int)sizeof(com_token) - 1) { - com_token[len] = 0; - return data; + com_token[0] = 0; + *datapointer = NULL; + return false; } - com_token[len] = c; - len++; + com_token[len++] = *data; } + com_token[len] = 0; + *datapointer = data+1; + return true; } - -// parse single characters - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') + else { - com_token[len] = c; - len++; + // 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; - return data+1; + *datapointer = data; + return true; } - -// parse a regular word - do - { - com_token[len] = c; - data++; - len++; - c = *data; - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') - break; - } while (c>32); - - com_token[len] = 0; - return data; } @@ -997,10 +669,10 @@ Returns the position (1 to argc-1) in the program's argument list where the given parameter apears, or 0 if not present ================ */ -int COM_CheckParm (char *parm) +int COM_CheckParm (const char *parm) { - int i; - + int i; + for (i=1 ; inext) + while (*in && size_out > 1) { - if (s->pack) - { - Con_Printf ("%s (%i files)\n", s->pack->filename, s->pack->numfiles); - } + if (*in >= 'A' && *in <= 'Z') + *out++ = *in++ + 'a' - 'A'; else - Con_Printf ("%s\n", s->filename); + *out++ = *in++; + size_out--; } + *out = '\0'; } -/* -============ -COM_WriteFile - -The filename will be prefixed by the current game directory -============ -*/ -void COM_WriteFile (char *filename, void *data, int len) +void COM_ToUpperString (const char *in, char *out, size_t size_out) { - int handle; - char name[MAX_OSPATH]; - - sprintf (name, "%s/%s", com_gamedir, filename); - - handle = Sys_FileOpenWrite (name); - if (handle == -1) - { - Sys_Printf ("COM_WriteFile: failed on %s\n", name); + if (size_out == 0) return; - } - - Sys_Printf ("COM_WriteFile: %s\n", name); - Sys_FileWrite (handle, data, len); - Sys_FileClose (handle); -} - -/* -============ -COM_CreatePath - -Only used for CopyFile -============ -*/ -void COM_CreatePath (char *path) -{ - char *ofs; - - for (ofs = path+1 ; *ofs ; ofs++) + while (*in && size_out > 1) { - if (*ofs == '/') - { // create the directory - *ofs = 0; - Sys_mkdir (path); - *ofs = '/'; - } + if (*in >= 'a' && *in <= 'z') + *out++ = *in++ + 'A' - 'a'; + else + *out++ = *in++; + size_out--; } + *out = '\0'; } - -/* -=========== -COM_CopyFile - -Copies a file over from the net to the local cache, creating any directories -needed. This is for the convenience of developers using ISDN from home. -=========== -*/ -void COM_CopyFile (char *netpath, char *cachepath) +int COM_StringBeginsWith(const char *s, const char *match) { - int in, out; - int remaining, count; - char buf[4096]; - - remaining = Sys_FileOpenRead (netpath, &in); - COM_CreatePath (cachepath); // create directories up to the cache file - out = Sys_FileOpenWrite (cachepath); - - while (remaining) - { - if (remaining < sizeof(buf)) - count = remaining; - else - count = sizeof(buf); - Sys_FileRead (in, buf, count); - Sys_FileWrite (out, buf, count); - remaining -= count; - } - - Sys_FileClose (in); - Sys_FileClose (out); + for (;*s && *match;s++, match++) + if (*s != *match) + return false; + return true; } -/* -=========== -COM_FindFile - -Finds the file in the search path. -Sets com_filesize and one of handle or file -=========== -*/ -int COM_FindFile (char *filename, int *handle, FILE **file, qboolean quiet) +int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix) { - searchpath_t *search; - char netpath[MAX_OSPATH]; - char cachepath[MAX_OSPATH]; - pack_t *pak; - int i; - int findtime, cachetime; - - if (file && handle) - Sys_Error ("COM_FindFile: both handle and file set"); - if (!file && !handle) - Sys_Error ("COM_FindFile: neither handle or file set"); - -// -// search through the path, one element at a time -// - search = com_searchpaths; - if (proghack) - { // gross hack to use quake 1 progs with quake 2 maps - if (!strcmp(filename, "progs.dat")) - search = search->next; - } - - for ( ; search ; search = search->next) + 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') { - // is the element a pak file? - if (search->pack) + if (*l > ' ') { - // look through all the pak file elements - pak = search->pack; - for (i=0 ; inumfiles ; i++) - if (!strcmp (pak->files[i].name, filename)) - { // found it! - if (!quiet) - Sys_Printf ("PackFile: %s : %s\n",pak->filename, filename); - if (handle) - { - *handle = pak->handle; - Sys_FileSeek (pak->handle, pak->files[i].filepos); - } - else - { // open a new file on the pakfile - *file = fopen (pak->filename, "rb"); - if (*file) - fseek (*file, pak->files[i].filepos, SEEK_SET); - } - com_filesize = pak->files[i].filelen; - return com_filesize; + 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++; } - } - else - { - // check a file in the directory tree -// if (!static_registered) -// { // if not a registered version, don't ever go beyond base -// if ( strchr (filename, '/') || strchr (filename,'\\')) -// continue; -// } - - sprintf (netpath, "%s/%s",search->filename, filename); - - findtime = Sys_FileTime (netpath); - if (findtime == -1) - continue; - - // see if the file needs to be updated in the cache - if (!com_cachedir[0]) - strcpy (cachepath, netpath); - else - { -#if defined(_WIN32) - if ((strlen(netpath) < 2) || (netpath[1] != ':')) - sprintf (cachepath,"%s%s", com_cachedir, netpath); - else - sprintf (cachepath,"%s%s", com_cachedir, netpath+2); -#else - sprintf (cachepath,"%s%s", com_cachedir, netpath); -#endif - - cachetime = Sys_FileTime (cachepath); - - if (cachetime < findtime) - COM_CopyFile (netpath, cachepath); - strcpy (netpath, cachepath); - } - - if (!quiet) - Sys_Printf ("FindFile: %s\n",netpath); - com_filesize = Sys_FileOpenRead (netpath, &i); - if (handle) - *handle = i; + if (*l == '"') + l++; + } else { - Sys_FileClose (i); - *file = fopen (netpath, "rb"); + while (*l > ' ') + { + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = *l++; + } } - return com_filesize; + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = 0; } - - } - - if (!quiet) - Sys_Printf ("FindFile: can't find %s\n", filename); - - if (handle) - *handle = -1; - else - *file = NULL; - com_filesize = -1; - return -1; -} - - -/* -=========== -COM_OpenFile - -filename never has a leading slash, but may contain directory walks -returns a handle and a length -it may actually be inside a pak file -=========== -*/ -int COM_OpenFile (char *filename, int *handle, qboolean quiet) -{ - return COM_FindFile (filename, handle, NULL, quiet); -} - -/* -=========== -COM_FOpenFile - -If the requested file is inside a packfile, a new FILE * will be opened -into the file. -=========== -*/ -int COM_FOpenFile (char *filename, FILE **file, qboolean quiet) -{ - return COM_FindFile (filename, NULL, file, quiet); -} - -/* -============ -COM_CloseFile - -If it is a pak file handle, don't really close it -============ -*/ -void COM_CloseFile (int h) -{ - searchpath_t *s; - - for (s = com_searchpaths ; s ; s=s->next) - if (s->pack && s->pack->handle == h) - return; - - Sys_FileClose (h); -} - - -/* -============ -COM_LoadFile - -Filename are reletive to the quake directory. -Allways appends a 0 byte. -============ -*/ -cache_user_t *loadcache; -byte *loadbuf; -int loadsize; -byte *COM_LoadFile (char *path, int usehunk, qboolean quiet) -{ - int h; - byte *buf; - char base[32]; - int len; - - buf = NULL; // quiet compiler warning - -// look for it in the filesystem or pack files - len = COM_OpenFile (path, &h, quiet); - if (h == -1) - return NULL; - -// extract the filename base name for hunk tag - COM_FileBase (path, base); - - if (usehunk == 1) - buf = Hunk_AllocName (len+1, base); - else if (usehunk == 2) - buf = Hunk_TempAlloc (len+1); - else if (usehunk == 0) - buf = Z_Malloc (len+1); - else if (usehunk == 3) - buf = Cache_Alloc (loadcache, len+1, base); - else if (usehunk == 4) - { - if (len+1 > loadsize) - buf = Hunk_TempAlloc (len+1); else - buf = loadbuf; + l++; } - else - Sys_Error ("COM_LoadFile: bad usehunk"); - - if (!buf) - Sys_Error ("COM_LoadFile: not enough space for %s", path); - - ((byte *)buf)[len] = 0; - - Sys_FileRead (h, buf, len); - COM_CloseFile (h); - - return buf; -} - -byte *COM_LoadHunkFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 1, quiet); -} - -byte *COM_LoadTempFile (char *path, qboolean quiet) -{ - return COM_LoadFile (path, 2, quiet); -} - -void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet) -{ - loadcache = cu; - COM_LoadFile (path, 3, quiet); + if (*l == '\n') + l++; + *text = l; + return argc; } -// uses temp hunk if larger than bufsize -byte *COM_LoadStackFile (char *path, void *buffer, int bufsize, qboolean quiet) +// written by Elric, thanks Elric! +char *SearchInfostring(const char *infostring, const char *key) { - byte *buf; - - loadbuf = (byte *)buffer; - loadsize = bufsize; - buf = COM_LoadFile (path, 4, quiet); - - return buf; -} - -/* -================= -COM_LoadPackFile + static char value [256]; + char crt_key [256]; + size_t value_ind, key_ind; + char c; -Takes an explicit (not game tree related) path to a pak file. - -Loads the header and directory, adding the files at the beginning -of the list so they override previous pack files. -================= -*/ -pack_t *COM_LoadPackFile (char *packfile) -{ - dpackheader_t header; - int i; - packfile_t *newfiles; - int numpackfiles; - pack_t *pack; - int packhandle; - dpackfile_t info[MAX_FILES_IN_PACK]; - unsigned short crc; - - if (Sys_FileOpenRead (packfile, &packhandle) == -1) - { -// Con_Printf ("Couldn't open %s\n", packfile); + if (*infostring++ != '\\') return NULL; - } - Sys_FileRead (packhandle, (void *)&header, sizeof(header)); - if (header.id[0] != 'P' || header.id[1] != 'A' - || header.id[2] != 'C' || header.id[3] != 'K') - Sys_Error ("%s is not a packfile", packfile); - header.dirofs = LittleLong (header.dirofs); - header.dirlen = LittleLong (header.dirlen); - - numpackfiles = header.dirlen / sizeof(dpackfile_t); - - if (numpackfiles > MAX_FILES_IN_PACK) - Sys_Error ("%s has %i files", packfile, numpackfiles); - - if (numpackfiles != PAK0_COUNT) - com_modified = true; // not the original file - - newfiles = Hunk_AllocName (numpackfiles * sizeof(packfile_t), "packfile"); - - Sys_FileSeek (packhandle, header.dirofs); - Sys_FileRead (packhandle, (void *)info, header.dirlen); - -// crc the directory to check for modifications - CRC_Init (&crc); - // LordHavoc: speedup - CRC_ProcessBytes(&crc, (byte *)info, header.dirlen); -// for (i=0 ; ifilename, packfile); - pack->handle = packhandle; - pack->numfiles = numpackfiles; - pack->files = newfiles; - - Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles); - return pack; -} + key_ind = 0; + // Get the key name + for (;;) + { + c = *infostring++; -/* -================ -COM_AddGameDirectory + if (c == '\0') + return NULL; + if (c == '\\' || key_ind == sizeof (crt_key) - 1) + { + crt_key[key_ind] = '\0'; + break; + } -Sets com_gamedir, adds the directory to the head of the path, -then loads and adds pak1.pak pak2.pak ... -================ -*/ -void COM_AddGameDirectory (char *dir) -{ - int i; - searchpath_t *search; - pack_t *pak; - char pakfile[MAX_OSPATH]; + crt_key[key_ind++] = c; + } - strcpy (com_gamedir, dir); + // If it's the key we are looking for, save it in "value" + if (!strcmp(crt_key, key)) + { + for (;;) + { + c = *infostring++; -// -// add the directory to the search path -// - search = Hunk_Alloc (sizeof(searchpath_t)); - strcpy (search->filename, dir); - search->next = com_searchpaths; - com_searchpaths = search; + if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1) + { + value[value_ind] = '\0'; + return value; + } -// -// add any pak files in the format pak0.pak pak1.pak, ... -// - for (i=0 ; ; i++) - { - sprintf (pakfile, "%s/pak%i.pak", dir, i); - pak = COM_LoadPackFile (pakfile); - if (!pak) - break; - search = Hunk_Alloc (sizeof(searchpath_t)); - search->pack = pak; - search->next = com_searchpaths; - com_searchpaths = search; - } + value[value_ind++] = c; + } + } -// -// add the contents of the parms.txt file to the end of the command line -// + // Else, skip the value + for (;;) + { + c = *infostring++; + if (c == '\0') + return NULL; + if (c == '\\') + break; + } + } } -/* -================ -COM_InitFilesystem -================ -*/ -void COM_InitFilesystem (void) -{ - int i, j; - char basedir[MAX_OSPATH]; - searchpath_t *search; - -// -// -basedir -// Overrides the system supplied base directory (under GAMENAME) -// - i = COM_CheckParm ("-basedir"); - if (i && i < com_argc-1) - strcpy (basedir, com_argv[i+1]); - else - strcpy (basedir, host_parms.basedir); - j = strlen (basedir); +//======================================================== +// strlcat and strlcpy, from OpenBSD - if (j > 0) - { - if ((basedir[j-1] == '\\') || (basedir[j-1] == '/')) - basedir[j-1] = 0; +/* + * 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'; -// -// -cachedir -// Overrides the system supplied cache directory (NULL or /qcache) -// -cachedir - will disable caching. -// - i = COM_CheckParm ("-cachedir"); - if (i && i < com_argc-1) - { - if (com_argv[i+1][0] == '-') - com_cachedir[0] = 0; - else - strcpy (com_cachedir, com_argv[i+1]); - } - else if (host_parms.cachedir) - strcpy (com_cachedir, host_parms.cachedir); - else - com_cachedir[0] = 0; + return(dlen + (s - src)); /* count does not include NUL */ +} +#endif // #ifndef HAVE_STRLCAT -// -// start up with GAMENAME by default (id1) -// - COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); - -#ifdef NEHAHRA - COM_AddGameDirectory (va("%s/nehahra", basedir) ); -#else - if (COM_CheckParm ("-rogue")) - COM_AddGameDirectory (va("%s/rogue", basedir) ); - if (COM_CheckParm ("-hipnotic")) - COM_AddGameDirectory (va("%s/hipnotic", basedir) ); - if (COM_CheckParm ("-nehahra")) - COM_AddGameDirectory (va("%s/nehahra", basedir) ); -#endif -// -// -game -// Adds basedir/gamedir as an override game -// - i = COM_CheckParm ("-game"); - if (i && i < com_argc-1) - { - com_modified = true; - COM_AddGameDirectory (va("%s/%s", basedir, com_argv[i+1])); - } +#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; -// -// -path [] ... -// Fully specifies the exact serach path, overriding the generated one -// - i = COM_CheckParm ("-path"); - if (i) - { - com_modified = true; - com_searchpaths = NULL; - while (++i < com_argc) - { - if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-') + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) break; - - search = Hunk_Alloc (sizeof(searchpath_t)); - if ( !strcmp(COM_FileExtension(com_argv[i]), "pak") ) - { - search->pack = COM_LoadPackFile (com_argv[i]); - if (!search->pack) - Sys_Error ("Couldn't load packfile: %s", com_argv[i]); - } - else - strcpy (search->filename, com_argv[i]); - search->next = com_searchpaths; - com_searchpaths = search; - } + } while (--n != 0); } - if (COM_CheckParm ("-proghack")) - proghack = true; -} - -int COM_FileExists(char *filename) -{ - searchpath_t *search; - char netpath[MAX_OSPATH]; - pack_t *pak; - int i; - int findtime; - - for (search = com_searchpaths;search;search = search->next) - { - if (search->pack) - { - pak = search->pack; - for (i = 0;i < pak->numfiles;i++) - if (!strcmp (pak->files[i].name, filename)) - return true; - } - else - { - sprintf (netpath, "%s/%s",search->filename, filename); - findtime = Sys_FileTime (netpath); - if (findtime != -1) - return true; - } + /* 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 false; + return(s - src - 1); /* count does not include NUL */ } +#endif // #ifndef HAVE_STRLCPY