X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.h;h=460d5325dd7107d20bd78dd6353cccb57d1d0f28;hb=be511c50c3e4e5fa25e56fb957690072d51314c5;hp=210b8af85bc92a4188bc7074223a2640121cc5f6;hpb=f78b6c54a30669f2c6c9bd86c50844887dd88af9;p=xonotic%2Fdarkplaces.git diff --git a/common.h b/common.h index 210b8af8..460d5325 100644 --- a/common.h +++ b/common.h @@ -21,11 +21,14 @@ 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 -# define strcasecmp stricmp -# define strncasecmp strnicmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp #endif // Create our own define for Mac OS X @@ -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 unsigned char *data, size_t size); + +unsigned char COM_BlockSequenceCRCByteQW(unsigned char *base, int length, int sequence); -unsigned short CRC_Block(const qbyte *data, int size); +// these are actually md4sum (mdfour.c) +unsigned Com_BlockChecksum (void *buffer, int length); +void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf); //============================================================================ @@ -81,8 +84,9 @@ unsigned short CRC_Block(const qbyte *data, int size); #endif // If we still don't know the CPU endianess at this point, we try to guess +// normally including sys/types.h includes endian.h for the platform, which defines BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN, however endian.h is a BSD-ism, and may not be present on all platforms (particularly windows) #ifndef BYTE_ORDER -# if defined(WIN32) +# if defined(WIN32) || defined (__i386) || defined(__amd64) # define BYTE_ORDER LITTLE_ENDIAN # else # if defined(SUNOS) @@ -121,10 +125,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 +148,10 @@ 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 + PROTOCOL_NEHAHRABJP, // same as QUAKEDP but with 16bit modelindex + PROTOCOL_NEHAHRABJP2, // same as NEHAHRABJP but with 16bit soundindex + PROTOCOL_NEHAHRABJP3, // same as NEHAHRABJP2 but with some changes } protocolversion_t; @@ -153,6 +161,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,10 +203,12 @@ 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); +int COM_ParseToken_Simple(const char **datapointer, qboolean returnnewline, qboolean parsebackslash); +int COM_ParseToken_QuakeC(const char **datapointer, qboolean returnnewline); +int COM_ParseToken_VM_Tokenize(const char **datapointer, qboolean returnnewline); +int COM_ParseToken_Console(const char **datapointer); extern int com_argc; extern const char **com_argv; @@ -205,10 +216,9 @@ 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, ...); +char *va(const char *format, ...) DP_FUNC_PRINTF(1); // does a varargs printf into a temp buffer @@ -220,9 +230,22 @@ char *va(const char *format, ...); // return the number of printed characters, excluding the final '\0' // or return -1 if the buffer isn't big enough to contain the entire string. // buffer is ALWAYS null-terminated -extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...); +extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...) DP_FUNC_PRINTF(3); 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,15 +264,17 @@ typedef enum gamemode_e GAME_TEU, GAME_BATTLEMECH, GAME_ZYMOTIC, - GAME_FNIGGIUM, GAME_SETHERAL, GAME_SOM, GAME_TENEBRAE, // full of evil hackery GAME_NEOTERIC, GAME_OPENQUARTZ, //this game sucks GAME_PRYDON, - GAME_NETHERWORLD, + GAME_DELUXEQUAKE, GAME_THEHUNTED, + GAME_DEFEATINDETAIL2, + GAME_DARSANA, + GAME_CONTAGIONTHEORY, } gamemode_t; @@ -267,21 +292,31 @@ int COM_StringBeginsWith(const char *s, const char *match); int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix); +size_t COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid); +qboolean COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qboolean escape_carets); +void COM_ToLowerString (const char *in, char *out, size_t size_out); +void COM_ToUpperString (const char *in, char *out, size_t size_out); + typedef struct stringlist_s { - struct stringlist_s *next; - char *text; + // maxstrings changes as needed, causing reallocation of strings[] array + int maxstrings; + int numstrings; + char **strings; } stringlist_t; -int matchpattern(char *in, char *pattern, int caseinsensitive); -stringlist_t *stringlistappend(stringlist_t *current, char *text); -void stringlistfree(stringlist_t *current); -stringlist_t *stringlistsort(stringlist_t *start); -stringlist_t *listdirectory(const char *path); -void freedirectory(stringlist_t *list); +int matchpattern(const char *in, const char *pattern, int caseinsensitive); +void stringlistinit(stringlist_t *list); +void stringlistfreecontents(stringlist_t *list); +void stringlistappend(stringlist_t *list, char *text); +void stringlistsort(stringlist_t *list); +void listdirectory(stringlist_t *list, const char *path); 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