X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.h;h=0cb18bfb59c901b32bc56b8db8ac25f37203301a;hb=62bc56e9c2d45afe69ba3f1ebb87f40d5753eeab;hp=cceb571af3ff090c3b1c66a3a357bc165da5c286;hpb=11e05215e5f3cee630f54b9836dab1b36b5b4ffc;p=xonotic%2Fdarkplaces.git diff --git a/common.h b/common.h index cceb571a..0cb18bfb 100644 --- a/common.h +++ b/common.h @@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef COMMON_H #define COMMON_H +// many buffers use this size +#define MAX_INPUTLINE 16384 + // MSVC has a different name for several standard functions #ifdef WIN32 @@ -33,11 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # define MACOSX #endif -// Create our own define for Solaris -#if defined(__sun__) && defined(__svr4__) -# define SUNOS -#endif - #ifdef SUNOS #include // Needed for FNDELAY # define model_t dp_model_t // Workaround conflict with /usr/include/sys/model.h @@ -49,20 +47,25 @@ typedef struct sizebuf_s { qboolean allowoverflow; // if false, do a Sys_Error qboolean overflowed; // set to true if the buffer size failed - qbyte *data; + unsigned char *data; int maxsize; int cursize; } sizebuf_t; void SZ_Clear (sizebuf_t *buf); -void *SZ_GetSpace (sizebuf_t *buf, int length); -void SZ_Write (sizebuf_t *buf, const void *data, int length); -void SZ_Print(sizebuf_t *buf, const char *data); // strcats onto the sizebuf +unsigned char *SZ_GetSpace (sizebuf_t *buf, int length); +void SZ_Write (sizebuf_t *buf, const unsigned char *data, int length); void SZ_HexDumpToConsole(const sizebuf_t *buf); -void Com_HexDumpToConsole(const qbyte *data, int size); +void Com_HexDumpToConsole(const unsigned char *data, int size); -unsigned short CRC_Block(const qbyte *data, size_t size); +unsigned short CRC_Block(const unsigned char *data, size_t size); + +unsigned char COM_BlockSequenceCRCByteQW(unsigned char *base, int length, int sequence); + +// these are actually md4sum (mdfour.c) +unsigned Com_BlockChecksum (void *buffer, int length); +void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf); //============================================================================ @@ -121,10 +124,10 @@ float FloatSwap (float f); #define LittleFloat(l) FloatSwap(l) #endif -unsigned int BuffBigLong (const qbyte *buffer); -unsigned short BuffBigShort (const qbyte *buffer); -unsigned int BuffLittleLong (const qbyte *buffer); -unsigned short BuffLittleShort (const qbyte *buffer); +unsigned int BuffBigLong (const unsigned char *buffer); +unsigned short BuffBigShort (const unsigned char *buffer); +unsigned int BuffLittleLong (const unsigned char *buffer); +unsigned short BuffLittleShort (const unsigned char *buffer); //============================================================================ @@ -144,6 +147,7 @@ typedef enum protocolversion_e PROTOCOL_QUAKEDP, // darkplaces extended quake protocol (used by TomazQuake and others), backwards compatible as long as no extended features are used PROTOCOL_NEHAHRAMOVIE, // Nehahra movie protocol, a big nasty hack dating back to early days of the Quake Standards Group (but only ever used by neh_gl.exe), this is potentially backwards compatible with quake protocol as long as no extended features are used (but in actuality the neh_gl.exe which wrote this protocol ALWAYS wrote the extended information) PROTOCOL_QUAKE, // quake (aka netquake/normalquake/nq) protocol + PROTOCOL_QUAKEWORLD, // quakeworld protocol } protocolversion_t; @@ -153,6 +157,7 @@ void MSG_WriteShort (sizebuf_t *sb, int c); void MSG_WriteLong (sizebuf_t *sb, int c); void MSG_WriteFloat (sizebuf_t *sb, float f); void MSG_WriteString (sizebuf_t *sb, const char *s); +void MSG_WriteUnterminatedString (sizebuf_t *sb, const char *s); void MSG_WriteAngle8i (sizebuf_t *sb, float f); void MSG_WriteAngle16i (sizebuf_t *sb, float f); void MSG_WriteAngle32f (sizebuf_t *sb, float f); @@ -194,7 +199,7 @@ float MSG_ReadAngle (protocolversion_t protocol); //============================================================================ -extern char com_token[1024]; +extern char com_token[MAX_INPUTLINE]; int COM_ParseToken(const char **datapointer, int returnnewline); int COM_ParseTokenConsole(const char **datapointer); @@ -205,7 +210,6 @@ extern const char **com_argv; int COM_CheckParm (const char *parm); void COM_Init (void); void COM_Shutdown (void); -void COM_InitArgv (void); void COM_InitGameType (void); char *va(const char *format, ...); @@ -223,6 +227,19 @@ char *va(const char *format, ...); extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...); extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args); +// A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them) +// LordHavoc: added #undef lines here to avoid warnings in Linux +#undef strcat +#define strcat DO_NOT_USE_STRCAT__USE_STRLCAT_OR_MEMCPY +#undef strncat +#define strncat DO_NOT_USE_STRNCAT__USE_STRLCAT_OR_MEMCPY +#undef strcpy +#define strcpy DO_NOT_USE_STRCPY__USE_STRLCPY_OR_MEMCPY +#undef strncpy +#define strncpy DO_NOT_USE_STRNCPY__USE_STRLCPY_OR_MEMCPY +//#undef sprintf +//#define sprintf DO_NOT_USE_SPRINTF__USE_DPSNPRINTF + //============================================================================ @@ -241,7 +258,6 @@ typedef enum gamemode_e GAME_TEU, GAME_BATTLEMECH, GAME_ZYMOTIC, - GAME_FNIGGIUM, GAME_SETHERAL, GAME_SOM, GAME_TENEBRAE, // full of evil hackery @@ -250,6 +266,7 @@ typedef enum gamemode_e GAME_PRYDON, GAME_NETHERWORLD, GAME_THEHUNTED, + GAME_DEFEATINDETAIL2, } gamemode_t; @@ -273,7 +290,7 @@ typedef struct stringlist_s char *text; } stringlist_t; -int matchpattern(char *in, char *pattern, int caseinsensitive); +int matchpattern(const char *in, const char *pattern, int caseinsensitive); stringlist_t *stringlistappend(stringlist_t *current, char *text); void stringlistfree(stringlist_t *current); stringlist_t *stringlistsort(stringlist_t *start); @@ -282,6 +299,9 @@ void freedirectory(stringlist_t *list); char *SearchInfostring(const char *infostring, const char *key); +void InfoString_GetValue(const char *buffer, const char *key, char *value, size_t valuelength); +void InfoString_SetValue(char *buffer, size_t bufferlength, const char *key, const char *value); +void InfoString_Print(char *buffer); // strlcat and strlcpy, from OpenBSD // Most (all?) BSDs already have them