X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=common.c;h=1414e31f6f074951812ee66140cbe9e5e0915bad;hp=3859d20bde55cc0205b71f02438add599dd4df22;hb=64fc4c197c0dba80bef067fd75d369aa727d5123;hpb=ea7c24e1fb41f3b1df984ac0eed6881c9fde16f5 diff --git a/common.c b/common.c index 3859d20b..1414e31f 100644 --- a/common.c +++ b/common.c @@ -21,108 +21,31 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#ifdef WIN32 -#include -#else +#ifndef WIN32 #include #endif #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", "-window"}; - cvar_t registered = {0, "registered","0"}; cvar_t cmdline = {0, "cmdline","0"}; -mempool_t *pak_mempool; - -qboolean com_modified; // set true if using non-id files - -qboolean msg_suppress_1 = 0; - -void COM_InitFilesystem (void); +extern qboolean fs_modified; // set true if using non-id files char com_token[1024]; int com_argc; -char **com_argv; +const char **com_argv; // LordHavoc: made commandline 1024 characters instead of 256 #define CMDLINE_LENGTH 1024 char com_cmdline[CMDLINE_LENGTH]; int gamemode; -char *gamename; - -/* - - -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. - -*/ - -//============================================================================ - - -/* -============================================================================ - - LIBRARY REPLACEMENT FUNCTIONS - -============================================================================ -*/ - -int Q_strncasecmp (char *s1, char *s2, int n) -{ - int c1, c2; - - while (1) - { - c1 = *s1++; - c2 = *s2++; +const char *gamename; +const char *gamedirname; +const char *gamescreenshotname; +char com_modname[MAX_OSPATH] = ""; - 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 - } - - return -1; -} - -int Q_strcasecmp (char *s1, char *s2) -{ - return Q_strncasecmp (s1, s2, 99999); -} /* ============================================================================ @@ -132,15 +55,6 @@ int Q_strcasecmp (char *s1, char *s2) ============================================================================ */ -#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; @@ -151,13 +65,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; @@ -170,13 +77,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 @@ -194,12 +94,89 @@ float FloatSwap (float f) return dat2.f; } -#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG) -float FloatNoSwap (float f) + +// Extract integers from buffers + +unsigned int BuffBigLong (const qbyte *buffer) { - return f; + return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; } -#endif + +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]; +} + + +/* +============================================================================ + + CRC FUNCTIONS + +============================================================================ +*/ + +// this is a 16 bit, non-reflected CRC using the polynomial 0x1021 +// and the initial and final xor values shown below... in other words, the +// CCITT standard CRC used by XMODEM + +#define CRC_INIT_VALUE 0xffff +#define CRC_XOR_VALUE 0x0000 + +static unsigned short crctable[256] = +{ + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 +}; + +unsigned short CRC_Block(qbyte *data, int size) +{ + unsigned short crc = CRC_INIT_VALUE; + while (size--) + crc = (crc << 8) ^ crctable[(crc >> 8) ^ (*data++)]; + return crc ^ CRC_XOR_VALUE; +} + /* ============================================================================== @@ -217,7 +194,7 @@ Handles byte ordering and avoids alignment errors void MSG_WriteChar (sizebuf_t *sb, int c) { qbyte *buf; - + buf = SZ_GetSpace (sb, 1); buf[0] = c; } @@ -225,7 +202,7 @@ void MSG_WriteChar (sizebuf_t *sb, int c) void MSG_WriteByte (sizebuf_t *sb, int c) { qbyte *buf; - + buf = SZ_GetSpace (sb, 1); buf[0] = c; } @@ -265,7 +242,7 @@ void MSG_WriteFloat (sizebuf_t *sb, float f) 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); @@ -273,37 +250,81 @@ void MSG_WriteString (sizebuf_t *sb, char *s) SZ_Write (sb, s, strlen(s)+1); } -// used by server (always latest dpprotocol) -void MSG_WriteDPCoord (sizebuf_t *sb, float f) +void MSG_WriteCoord13i (sizebuf_t *sb, float f) { if (f >= 0) - MSG_WriteShort (sb, (int)(f + 0.5f)); + MSG_WriteShort (sb, (int)(f * 8.0 + 0.5)); else - MSG_WriteShort (sb, (int)(f - 0.5f)); + MSG_WriteShort (sb, (int)(f * 8.0 - 0.5)); } -void MSG_WritePreciseAngle (sizebuf_t *sb, float f) +void MSG_WriteCoord16i (sizebuf_t *sb, float f) { if (f >= 0) - MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535); + MSG_WriteShort (sb, (int)(f + 0.5)); + else + MSG_WriteShort (sb, (int)(f - 0.5)); +} + +void MSG_WriteCoord32f (sizebuf_t *sb, float f) +{ + MSG_WriteFloat (sb, f); +} + +void MSG_WriteCoord (sizebuf_t *sb, float f, int protocol) +{ + if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_NEHAHRAMOVIE) + MSG_WriteCoord13i (sb, f); + else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) + MSG_WriteCoord32f (sb, f); + else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4) + MSG_WriteCoord16i (sb, f); else - MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) - 0.5f) & 65535); + Host_Error("MSG_WriteCoord: unknown protocol\n"); +} + +void MSG_WriteVector (sizebuf_t *sb, float *v, int protocol) +{ + MSG_WriteCoord (sb, v[0], protocol); + MSG_WriteCoord (sb, v[1], protocol); + MSG_WriteCoord (sb, v[2], protocol); } // LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem -void MSG_WriteAngle (sizebuf_t *sb, float f) +void MSG_WriteAngle8i (sizebuf_t *sb, float f) +{ + if (f >= 0) + MSG_WriteByte (sb, (int)(f*(256.0/360.0) + 0.5) & 255); + else + MSG_WriteByte (sb, (int)(f*(256.0/360.0) - 0.5) & 255); +} + +void MSG_WriteAngle16i (sizebuf_t *sb, float f) { if (f >= 0) - MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255); + MSG_WriteShort (sb, (int)(f*(65536.0/360.0) + 0.5) & 65535); + else + MSG_WriteShort (sb, (int)(f*(65536.0/360.0) - 0.5) & 65535); +} + +void MSG_WriteAngle32f (sizebuf_t *sb, float f) +{ + MSG_WriteFloat (sb, f); +} + +void MSG_WriteAngle (sizebuf_t *sb, float f, int protocol) +{ + if (protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) + MSG_WriteAngle16i (sb, f); else - MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) - 0.5f) & 255); + MSG_WriteAngle8i (sb, f); } // // reading functions // -int msg_readcount; -qboolean msg_badread; +int msg_readcount; +qboolean msg_badread; void MSG_BeginReading (void) { @@ -311,109 +332,168 @@ void MSG_BeginReading (void) msg_badread = false; } -int MSG_ReadShort (void) +int MSG_ReadLittleShort (void) { - int c; - if (msg_readcount+2 > 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; + return (short)(net_message.data[msg_readcount-2] | (net_message.data[msg_readcount-1]<<8)); } -int MSG_ReadLong (void) +int MSG_ReadBigShort (void) { - int c; + if (msg_readcount+2 > net_message.cursize) + { + msg_badread = true; + return -1; + } + msg_readcount += 2; + return (short)((net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1]); +} +int MSG_ReadLittleLong (void) +{ 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 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 c; +int MSG_ReadBigLong (void) +{ + if (msg_readcount+4 > net_message.cursize) + { + msg_badread = true; + return -1; + } + msg_readcount += 4; + 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 { - qbyte 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 = 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; +} - dat.l = LittleLong (dat.l); - +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; } -// used by server (always latest dpprotocol) -float MSG_ReadDPCoord (void) +int MSG_ReadBytes (int numbytes, unsigned char *out) +{ + int l, c; + for (l = 0;l < numbytes && (c = MSG_ReadChar()) != -1;l++) + out[l] = c; + return l; +} + +float MSG_ReadCoord13i (void) +{ + return MSG_ReadLittleShort() * (1.0/8.0); +} + +float MSG_ReadCoord16i (void) +{ + return (signed short) MSG_ReadLittleShort(); +} + +float MSG_ReadCoord32f (void) +{ + return MSG_ReadLittleFloat(); +} + +float MSG_ReadCoord (int protocol) +{ + if (protocol == PROTOCOL_QUAKE || protocol == PROTOCOL_NEHAHRAMOVIE) + return MSG_ReadCoord13i(); + else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) + return MSG_ReadCoord32f(); + else if (protocol == PROTOCOL_DARKPLACES2 || protocol == PROTOCOL_DARKPLACES3 || protocol == PROTOCOL_DARKPLACES4) + return MSG_ReadCoord16i(); + Host_Error("MSG_ReadCoord: unknown protocol\n"); + return 0; +} + +void MSG_ReadVector (float *v, int protocol) +{ + v[0] = MSG_ReadCoord(protocol); + v[1] = MSG_ReadCoord(protocol); + v[2] = MSG_ReadCoord(protocol); +} + +// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem +float MSG_ReadAngle8i (void) +{ + return (signed char) MSG_ReadByte () * (360.0/256.0); +} + +float MSG_ReadAngle16i (void) +{ + return (signed short)MSG_ReadShort () * (360.0/65536.0); +} + +float MSG_ReadAngle32f (void) { - return (signed short) MSG_ReadShort(); + return MSG_ReadFloat (); } -// used by client -float MSG_ReadCoord (void) +float MSG_ReadAngle (int protocol) { - if (dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3) - return (signed short) MSG_ReadShort(); - else if (dpprotocol == DPPROTOCOL_VERSION1) - return MSG_ReadFloat(); + if (protocol == PROTOCOL_DARKPLACES5 || protocol == PROTOCOL_DARKPLACES6) + return MSG_ReadAngle16i (); else - return MSG_ReadShort() * (1.0f/8.0f); + return MSG_ReadAngle8i (); } //=========================================================================== -void SZ_Alloc (sizebuf_t *buf, int startsize, char *name) +void SZ_Alloc (sizebuf_t *buf, int startsize, const char *name) { if (startsize < 256) startsize = 256; - buf->mempool = Mem_AllocPool(name); + buf->mempool = Mem_AllocPool(name, 0, NULL); buf->data = Mem_Alloc(buf->mempool, startsize); buf->maxsize = startsize; buf->cursize = 0; @@ -435,244 +515,294 @@ 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) - Host_Error ("SZ_GetSpace: overflow without allowoverflow set"); + Host_Error ("SZ_GetSpace: overflow without allowoverflow set\n"); if (length > buf->maxsize) - Host_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"); + Con_Print("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) -{ - memcpy (SZ_GetSpace(buf,length),data,length); + return data; } -void SZ_Print (sizebuf_t *buf, char *data) +void SZ_Write (sizebuf_t *buf, const void *data, int length) { - 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 + memcpy (SZ_GetSpace(buf,length),data,length); } +// 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. -//============================================================================ - - -/* -============ -COM_SkipPath -============ -*/ -char *COM_SkipPath (char *pathname) -{ - char *last; - - last = pathname; - while (*pathname) - { - if (*pathname=='/') - last = pathname+1; - pathname++; - } - return last; -} - -/* -============ -COM_StripExtension -============ -*/ -// LordHavoc: replacement for severely broken COM_StripExtension that was used in original quake. -void COM_StripExtension (char *in, char *out) +static char *hexchar = "0123456789ABCDEF"; +void Com_HexDumpToConsole(const qbyte *data, int size) { - char *last = NULL; - while (*in) + int i, j, n; + char text[1024]; + char *cur, *flushpointer; + const qbyte *d; + cur = text; + flushpointer = text + 512; + for (i = 0;i < size;) { - if (*in == '.') - last = out; - else if (*in == '/' || *in == '\\' || *in == ':') - last = NULL; - *out++ = *in++; + n = 16; + if (n > size - i) + n = size - i; + d = data + i; + // print offset + *cur++ = hexchar[(i >> 12) & 15]; + *cur++ = hexchar[(i >> 8) & 15]; + *cur++ = hexchar[(i >> 4) & 15]; + *cur++ = hexchar[(i >> 0) & 15]; + *cur++ = ':'; + // print hex + for (j = 0;j < 16;j++) + { + if (j < n) + { + *cur++ = hexchar[(d[j] >> 4) & 15]; + *cur++ = hexchar[(d[j] >> 0) & 15]; + } + else + { + *cur++ = ' '; + *cur++ = ' '; + } + if ((j & 3) == 3) + *cur++ = ' '; + } + // print text + for (j = 0;j < 16;j++) + { + if (j < n) + { + if (d[j] >= ' ' && d[j] <= 127) + *cur++ = d[j]; + else + *cur++ = '.'; + } + else + *cur++ = ' '; + } + *cur++ = '\n'; + i += n; + if (cur >= flushpointer || i >= size) + { + *cur++ = 0; + Con_Print(text); + cur = text; + } } - if (last) - *last = 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; } -/* -============ -COM_FileBase -============ -*/ -void COM_FileBase (char *in, char *out) +void SZ_HexDumpToConsole(const sizebuf_t *buf) { - char *slash, *dot; - char *s; - - slash = in; - dot = NULL; - s = in; - while(*s) - { - if (*s == '/') - slash = s + 1; - if (*s == '.') - dot = s; - s++; - } - if (dot == NULL) - dot = s; - if (dot - slash < 2) - strcpy (out,"?model?"); - else - { - while (slash < dot) - *out++ = *slash++; - *out++ = 0; - } + Com_HexDumpToConsole(buf->data, buf->cursize); } -/* -================== -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) - { - if (*src == '.') - return; // it has an extension - src--; - } - - strcat (path, extension); -} +//============================================================================ /* ============== -COM_Parse +COM_ParseToken Parse a token out of a string ============== */ -char *COM_Parse (char *data) +int COM_ParseToken(const char **datapointer, int returnnewline) { - 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 != '\n' || !returnnewline);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[0] == '/' && data[1] == '/') { + // comment while (*data && *data != '\n') data++; goto skipwhite; } - - -// handle quoted strings specially - if (c == '\"') + else if (data[0] == '/' && data[1] == '*') { + // comment data++; - while (1) + while (*data && (data[0] != '*' || data[1] != '/')) + data++; + data += 2; + goto skipwhite; + } + else if (*data == '\"') + { + // quoted string + for (data++;*data != '\"';data++) { - c = *data++; - if (c=='\"' || !c) + if (*data == '\\' && data[1] == '"' ) + data++; + 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; + } + else if (*data == '\'') + { + // quoted string + for (data++;*data != '\'';data++) + { + if (*data == '\\' && data[1] == '\'' ) + 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; } - -// parse single characters - if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':') + else { - com_token[len] = c; - len++; + // regular word + for (;*data > ' ' && *data != '{' && *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; - return data+1; + *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; -// parse a regular word - do + if (!data) { - 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; + *datapointer = NULL; + return false; + } + +// skip whitespace +skipwhite: + for (;*data <= ' ';data++) + { + if (*data == 0) + { + // end of file + *datapointer = NULL; + return false; + } + } + + if (*data == '/' && data[1] == '/') + { + // comment + while (*data && *data != '\n') + data++; + 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 + { + // 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; + } } @@ -684,10 +814,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); - } -} - -/* -============ -COM_CreatePath - -LordHavoc: Previously only used for CopyFile, now also used for COM_WriteFile. -============ -*/ -void COM_CreatePath (char *path) -{ - char *ofs, save; - - for (ofs = path+1 ; *ofs ; ofs++) - { - if (*ofs == '/' || *ofs == '\\') - { - // create the directory - save = *ofs; - *ofs = 0; - Sys_mkdir (path); - *ofs = save; - } - } -} - - -/* -============ -COM_WriteFile - -The filename will be prefixed by the current game directory -============ -*/ -qboolean COM_WriteFile (char *filename, void *data, int len) -{ - int handle; - char name[MAX_OSPATH]; - - sprintf (name, "%s/%s", com_gamedir, filename); - - // LordHavoc: added this - COM_CreatePath (name); // create directories up to the file - - handle = Sys_FileOpenWrite (name); - if (handle == -1) - { - Con_Printf ("COM_WriteFile: failed on %s\n", name); - return false; + *out++ = *in++; + size_out--; } - - Con_DPrintf ("COM_WriteFile: %s\n", name); - Sys_FileWrite (handle, data, len); - Sys_FileClose (handle); - return true; + *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) +void COM_ToUpperString (const char *in, char *out, size_t size_out) { - int in, out; - int remaining, count; - char buf[4096]; + if (size_out == 0) + return; - remaining = Sys_FileOpenRead (netpath, &in); - COM_CreatePath (cachepath); // create directories up to the cache file - out = Sys_FileOpenWrite (cachepath); - - while (remaining) + while (*in && size_out > 1) { - if (remaining < sizeof(buf)) - count = remaining; + if (*in >= 'a' && *in <= 'z') + *out++ = *in++ + 'A' - 'a'; else - count = sizeof(buf); - Sys_FileRead (in, buf, count); - Sys_FileWrite (out, buf, count); - remaining -= count; + *out++ = *in++; + size_out--; } - - Sys_FileClose (in); - Sys_FileClose (out); + *out = '\0'; } -/* -=========== -COM_OpenRead -=========== -*/ -QFile * COM_OpenRead (const char *path, int offs, int len, qboolean zip) +int COM_StringBeginsWith(const char *s, const char *match) { - int fd = open (path, O_RDONLY); - unsigned char id[2]; - unsigned char len_bytes[4]; - - if (fd == -1) - { - Sys_Error ("Couldn't open %s", path); - return 0; - } - if (offs < 0 || len < 0) - { - // normal file - offs = 0; - len = lseek (fd, 0, SEEK_END); - lseek (fd, 0, SEEK_SET); - } - lseek (fd, offs, SEEK_SET); - if (zip) - { - read (fd, id, 2); - if (id[0] == 0x1f && id[1] == 0x8b) - { - lseek (fd, offs + len - 4, SEEK_SET); - read (fd, len_bytes, 4); - len = ((len_bytes[3] << 24) - | (len_bytes[2] << 16) - | (len_bytes[1] << 8) - | (len_bytes[0])); - } - } - lseek (fd, offs, SEEK_SET); - com_filesize = len; - -#ifdef WIN32 - setmode (fd, O_BINARY); -#endif - if (zip) - return Qdopen (fd, "rbz"); - else - return Qdopen (fd, "rb"); + 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, QFile **file, qboolean quiet, qboolean zip) +int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix) { - searchpath_t *search; - char netpath[MAX_OSPATH]; -#if CACHEENABLE - char cachepath[MAX_OSPATH]; - int cachetime; -#endif - pack_t *pak; - int i; - int findtime; - char gzfilename[MAX_OSPATH]; - int filenamelen; - - filenamelen = strlen (filename); - sprintf (gzfilename, "%s.gz", filename); - - if (!file) - Sys_Error ("COM_FindFile: file not set"); - -// -// search through the path, one element at a time -// - search = com_searchpaths; - - 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) - || !strcmp (pak->files[i].name, gzfilename)) - { // found it! - if (!quiet) - Sys_Printf ("PackFile: %s : %s\n",pak->filename, pak->files[i].name); - // open a new file on the pakfile - *file = COM_OpenRead (pak->filename, pak->files[i].filepos, pak->files[i].filelen, zip); - 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++; + } + if (*l == '"') + l++; + } + else + { + while (*l > ' ') + { + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = *l++; } + } + if (tokenbuf >= tokenbufend) + return -1; + *tokenbuf++ = 0; } else - { - sprintf (netpath, "%s/%s",search->filename, filename); - - findtime = Sys_FileTime (netpath); - if (findtime == -1) - continue; - -#if CACHEENABLE - // see if the file needs to be updated in the cache - if (com_cachedir[0]) - { -#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); - } -#endif - - if (!quiet) - Sys_Printf ("FindFile: %s\n",netpath); - *file = COM_OpenRead (netpath, -1, -1, zip); - return com_filesize; - } - + l++; } - - if (!quiet) - Sys_Printf ("FindFile: can't find %s\n", filename); - - *file = NULL; - com_filesize = -1; - return -1; -} - - -/* -=========== -COM_FOpenFile - -If the requested file is inside a packfile, a new QFile * will be opened -into the file. -=========== -*/ -int COM_FOpenFile (char *filename, QFile **file, qboolean quiet, qboolean zip) -{ - return COM_FindFile (filename, file, quiet, zip); -} - - -/* -============ -COM_LoadFile - -Filename are reletive to the quake directory. -Always appends a 0 byte. -============ -*/ -qbyte *loadbuf; -int loadsize; -qbyte *COM_LoadFile (char *path, qboolean quiet) -{ - QFile *h; - qbyte *buf; - char base[1024]; - int len; - - buf = NULL; // quiet compiler warning - loadsize = 0; - -// look for it in the filesystem or pack files - len = COM_FOpenFile (path, &h, quiet, true); - if (!h) - return NULL; - - loadsize = len; - -// extract the filename base name for hunk tag - COM_FileBase (path, base); - - buf = Mem_Alloc(tempmempool, len+1); - if (!buf) - Sys_Error ("COM_LoadFile: not enough available memory for %s (size %i)", path, len); - - ((qbyte *)buf)[len] = 0; - - Qread (h, buf, len); - Qclose (h); - - return buf; + if (*l == '\n') + l++; + *text = l; + return argc; } -/* -================= -COM_LoadPackFile - -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) +// written by Elric, thanks Elric! +char *SearchInfostring(const char *infostring, const char *key) { - dpackheader_t header; - int i; - int numpackfiles; - pack_t *pack; - int packhandle; - // LordHavoc: changed from stack array to temporary alloc, allowing huge pack directories - dpackfile_t *info; + static char value [256]; + char crt_key [256]; + size_t value_ind, key_ind; + char c; - if (Sys_FileOpenRead (packfile, &packhandle) == -1) + if (*infostring++ != '\\') return NULL; - Sys_FileRead (packhandle, (void *)&header, sizeof(header)); - if (memcmp(header.id, "PACK", 4)) - Sys_Error ("%s is not a packfile", packfile); - header.dirofs = LittleLong (header.dirofs); - header.dirlen = LittleLong (header.dirlen); - - if (header.dirlen % sizeof(dpackfile_t)) - Sys_Error ("%s has an invalid directory size", packfile); - - numpackfiles = header.dirlen / sizeof(dpackfile_t); - - if (numpackfiles > MAX_FILES_IN_PACK) - Sys_Error ("%s has %i files", packfile, numpackfiles); - - pack = Mem_Alloc(pak_mempool, sizeof (pack_t)); - strcpy (pack->filename, packfile); - pack->handle = packhandle; - pack->numfiles = numpackfiles; - pack->mempool = Mem_AllocPool(packfile); - pack->files = Mem_Alloc(pack->mempool, numpackfiles * sizeof(packfile_t)); - pack->next = packlist; - packlist = pack; - - info = Mem_Alloc(tempmempool, sizeof(*info) * numpackfiles); - Sys_FileSeek (packhandle, header.dirofs); - Sys_FileRead (packhandle, (void *)info, header.dirlen); - -// parse the directory - for (i = 0;i < numpackfiles;i++) + value_ind = 0; + for (;;) { - strcpy (pack->files[i].name, info[i].name); - pack->files[i].filepos = LittleLong(info[i].filepos); - pack->files[i].filelen = LittleLong(info[i].filelen); - } - - Mem_Free(info); - - Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles); - return pack; -} - - -/* -================ -COM_AddGameDirectory - -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) -{ - stringlist_t *list, *current; - searchpath_t *search; - pack_t *pak; - char pakfile[MAX_OSPATH]; - - strcpy (com_gamedir, dir); + key_ind = 0; -// -// add the directory to the search path -// - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); - strcpy (search->filename, dir); - search->next = com_searchpaths; - com_searchpaths = search; - - // add any paks in the directory - list = listdirectory(dir); - for (current = list;current;current = current->next) - { - if (matchpattern(current->text, "*.pak")) + // Get the key name + for (;;) { - sprintf (pakfile, "%s/%s", dir, current->text); - pak = COM_LoadPackFile (pakfile); - if (pak) + c = *infostring++; + + if (c == '\0') + return NULL; + if (c == '\\' || key_ind == sizeof (crt_key) - 1) { - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); - search->pack = pak; - search->next = com_searchpaths; - com_searchpaths = search; + crt_key[key_ind] = '\0'; + break; } - else - Con_Printf("unable to load pak \"%s\"\n", pakfile); - } - } - freedirectory(list); -} -/* -================ -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); - - if (j > 0) - { - if ((basedir[j-1] == '\\') || (basedir[j-1] == '/')) - basedir[j-1] = 0; - } - -#if CACHEENABLE -// -// -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; -#endif + crt_key[key_ind++] = c; + } -// start up with GAMENAME by default (id1) - COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); + // If it's the key we are looking for, save it in "value" + if (!strcmp(crt_key, key)) + { + for (;;) + { + c = *infostring++; - switch(gamemode) - { - case GAME_NORMAL: - break; - case GAME_HIPNOTIC: - COM_AddGameDirectory (va("%s/hipnotic", basedir) ); - break; - case GAME_ROGUE: - COM_AddGameDirectory (va("%s/rogue", basedir) ); - break; - case GAME_NEHAHRA: - COM_AddGameDirectory (va("%s/nehahra", basedir) ); - break; - case GAME_FIENDARENA: - COM_AddGameDirectory (va("%s/fiendarena", basedir) ); - break; - case GAME_ZYMOTIC: - COM_AddGameDirectory (va("%s/zymotic", basedir) ); - break; - case GAME_BLOODBATH: - COM_AddGameDirectory (va("%s/bb", basedir) ); - break; - default: - Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode); - break; - } + if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1) + { + value[value_ind] = '\0'; + return value; + } -// -// -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])); - } + value[value_ind++] = c; + } + } -// -// -path [] ... -// Fully specifies the exact search path, overriding the generated one -// - i = COM_CheckParm ("-path"); - if (i) - { - com_modified = true; - com_searchpaths = NULL; - while (++i < com_argc) + // Else, skip the value + for (;;) { - if (!com_argv[i] || com_argv[i][0] == '+' || com_argv[i][0] == '-') - break; + c = *infostring++; - search = Mem_Alloc(pak_mempool, 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; + if (c == '\0') + return NULL; + if (c == '\\') + break; } } } -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; +//======================================================== +// 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--; } - else - { - sprintf (netpath, "%s/%s",search->filename, filename); - findtime = Sys_FileTime (netpath); - if (findtime != -1) - return true; - } + s++; } + *d = '\0'; - return false; + return(dlen + (s - src)); /* count does not include NUL */ } +#endif // #ifndef HAVE_STRLCAT -//====================================== -// LordHavoc: added these because they are useful - -void COM_ToLowerString(char *in, char *out) +#ifndef HAVE_STRLCPY +size_t +strlcpy(char *dst, const char *src, size_t siz) { - while (*in) - { - if (*in >= 'A' && *in <= 'Z') - *out++ = *in++ + 'a' - 'A'; - else - *out++ = *in++; + 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); } -} -void COM_ToUpperString(char *in, char *out) -{ - while (*in) - { - if (*in >= 'a' && *in <= 'z') - *out++ = *in++ + 'A' - 'a'; - else - *out++ = *in++; + /* 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