char com_cmdline[CMDLINE_LENGTH];
int gamemode;
-char *gamename;
-char *gamedirname;
-char com_modname[MAX_OSPATH];
+const char *gamename;
+const char *gamedirname;
+const char *gamescreenshotname;
+char com_modname[MAX_OSPATH] = "";
/*
============================================================================
*/
-#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;
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;
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
return dat2.f;
}
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-float FloatNoSwap (float f)
-{
- return f;
-}
-#endif
-
// Extract integers from buffers
SZ_Write (sb, s, strlen(s)+1);
}
-// used by server (always latest PROTOCOL_DARKPLACES)
-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)
+ MSG_WriteCoord13i (sb, f);
+ else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5)
+ 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.0f/360.0f) + 0.5f) & 255);
+ 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_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)
+ MSG_WriteAngle16i (sb, f);
else
- MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) - 0.5f) & 255);
+ MSG_WriteAngle8i (sb, f);
}
//
return l;
}
-// used by server (always latest PROTOCOL_DARKPLACES)
-float MSG_ReadDPCoord (void)
+float MSG_ReadCoord13i (void)
+{
+ return MSG_ReadLittleShort() * (1.0/8.0);
+}
+
+float MSG_ReadCoord16i (void)
{
return (signed short) MSG_ReadLittleShort();
}
-// used by client
-float MSG_ReadCoord (void)
+float MSG_ReadCoord32f (void)
+{
+ return MSG_ReadLittleFloat();
+}
+
+float MSG_ReadCoord (int protocol)
+{
+ if (protocol == PROTOCOL_QUAKE)
+ return MSG_ReadCoord13i();
+ else if (protocol == PROTOCOL_DARKPLACES1 || protocol == PROTOCOL_DARKPLACES5)
+ 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)
{
- 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();
+ return (signed short)MSG_ReadShort () * (360.0/65536.0);
+}
+
+float MSG_ReadAngle32f (void)
+{
+ return MSG_ReadFloat ();
+}
+
+float MSG_ReadAngle (int protocol)
+{
+ if (protocol == PROTOCOL_DARKPLACES5)
+ return MSG_ReadAngle16i ();
else
- return MSG_ReadLittleShort() * (1.0f/8.0f);
+ return MSG_ReadAngle8i ();
}
{
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;
Host_Error ("SZ_GetSpace: %i is > full buffer size\n", length);
buf->overflowed = true;
- Con_Printf ("SZ_GetSpace: overflow\n");
+ Con_Print("SZ_GetSpace: overflow\n");
SZ_Clear (buf);
}
memcpy (SZ_GetSpace(buf,length),data,length);
}
-void SZ_Print (sizebuf_t *buf, const char *data)
-{
- int len;
- len = strlen(data)+1;
-
-// byte * cast to keep VC++ happy
- if (buf->data[buf->cursize-1])
- memcpy ((qbyte *)SZ_GetSpace(buf, len),data,len); // no trailing 0
- else
- memcpy ((qbyte *)SZ_GetSpace(buf, len-1)-1,data,len); // write over trailing 0
-}
+// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
+// attention, it has been eradicated from here, its only (former) use in
+// all of darkplaces.
static char *hexchar = "0123456789ABCDEF";
void Com_HexDumpToConsole(const qbyte *data, int size)
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++ = ':';
- for (j = 0;j < n;j++)
+ // print hex
+ for (j = 0;j < 16;j++)
{
- if (j & 1)
+ if (j < n)
{
- *cur++ = hexchar[(d[j] >> 4) & 15] | 0x80;
- *cur++ = hexchar[(d[j] >> 0) & 15] | 0x80;
+ *cur++ = hexchar[(d[j] >> 4) & 15];
+ *cur++ = hexchar[(d[j] >> 0) & 15];
}
else
{
- *cur++ = hexchar[(d[j] >> 4) & 15];
- *cur++ = hexchar[(d[j] >> 0) & 15];
+ *cur++ = ' ';
+ *cur++ = ' ';
}
+ if ((j & 3) == 3)
+ *cur++ = ' ';
}
- for (;j < 16;j++)
+ // print text
+ for (j = 0;j < 16;j++)
{
- *cur++ = ' ';
- *cur++ = ' ';
+ if (j < n)
+ {
+ if (d[j] >= ' ' && d[j] <= 127)
+ *cur++ = d[j];
+ else
+ *cur++ = '.';
+ }
+ else
+ *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);
+ Con_Print(text);
cur = text;
}
}
*/
int COM_ParseToken(const char **datapointer, int returnnewline)
{
- int c;
int len;
const char *data = *datapointer;
// skip whitespace
skipwhite:
- while ((c = *data) <= ' ' && (c != '\n' || !returnnewline))
+ for (;*data <= ' ' && (*data != '\n' || !returnnewline);data++)
{
- if (c == 0)
+ if (*data == 0)
{
// end of file
*datapointer = NULL;
return false;
}
- data++;
}
- // check if it's a comment
- if (c == '/')
+ 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 == '\"')
{
- // skip // comments
- if (data[1] == '/')
+ // quoted string
+ for (data++;*data != '\"';data++)
{
- while (*data && *data != '\n')
- data++;
- goto skipwhite;
+ if (!*data || len >= (int)sizeof(com_token) - 1)
+ {
+ com_token[0] = 0;
+ *datapointer = NULL;
+ return false;
+ }
+ com_token[len++] = *data;
}
- // skip /* comments
- if (data[1] == '*')
+ 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++)
{
- while (*data && (*data != '*' || data[1] != '/'))
- data++;
- data+=2;
- goto skipwhite;
+ 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;
}
+}
-// handle quoted strings specially
- if (c == '\"')
+/*
+==============
+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;
+
+ if (!data)
{
- data++;
- while (1)
+ *datapointer = NULL;
+ return false;
+ }
+
+// skip whitespace
+skipwhite:
+ for (;*data <= ' ';data++)
+ {
+ if (*data == 0)
{
- c = *data++;
- if (c == '\"' || !c)
- {
- com_token[len] = 0;
- *datapointer = data;
- return true;
- }
- com_token[len] = c;
- len++;
+ // end of file
+ *datapointer = NULL;
+ return false;
}
}
-// parse single characters
- if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n')
+ if (*data == '/' && data[1] == '/')
+ {
+ // comment
+ while (*data && *data != '\n')
+ data++;
+ goto skipwhite;
+ }
+ else if (*data == '\"')
{
- com_token[len] = c;
- len++;
+ // 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;
}
-
-// parse a regular word
- do
+ else
{
- com_token[len] = c;
- data++;
- len++;
- c = *data;
- if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';')
- break;
- } while (c>32);
-
- com_token[len] = 0;
- *datapointer = data;
- return true;
+ // 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;
+ }
}
if (!FS_FileExists("gfx/pop.lmp"))
{
if (fs_modified)
- Con_Printf ("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
+ Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
else
- Con_Printf ("Playing shareware version.\n");
+ Con_Print("Playing shareware version.\n");
return;
}
Cvar_Set ("registered", "1");
- Con_Printf ("Playing registered version.\n");
+ Con_Print("Playing registered version.\n");
}
for (j = 0;(j < MAX_NUM_ARGVS) && (j < com_argc);j++)
{
i = 0;
- while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
- com_cmdline[n++] = com_argv[j][i++];
+ if (strstr(com_argv[j], " "))
+ {
+ // arg contains whitespace, store quotes around it
+ com_cmdline[n++] = '\"';
+ while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
+ com_cmdline[n++] = com_argv[j][i++];
+ com_cmdline[n++] = '\"';
+ }
+ else
+ {
+ while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
+ com_cmdline[n++] = com_argv[j][i++];
+ }
if (n < (CMDLINE_LENGTH - 1))
com_cmdline[n++] = ' ';
else
com_cmdline[n] = 0;
}
+
+//===========================================================================
+
+// Game mods
+
+typedef struct
+{
+ const char* prog_name;
+ const char* cmdline;
+ const char* gamename;
+ const char* gamedirname;
+ const char* gamescreenshotname;
+} gamemode_info_t;
+
+static const gamemode_info_t gamemode_info [] =
+{// prog_name cmdline gamename gamedirname gamescreenshotname
+
+// GAME_NORMAL
+{ "", "-quake", "DarkPlaces-Quake", "", "dp" },
+// GAME_HIPNOTIC
+{ "hipnotic", "-hipnotic", "Darkplaces-Hipnotic", "hipnotic", "dp" },
+// GAME_ROGUE
+{ "rogue", "-rogue", "Darkplaces-Rogue", "rogue", "dp" },
+// GAME_NEHAHRA
+{ "nehahra", "-nehahra", "DarkPlaces-Nehahra", "nehahra", "dp" },
+// GAME_NEXUIZ
+{ "nexuiz", "-nexuiz", "Nexuiz", "data", "nexuiz" },
+// GAME_TRANSFUSION
+{ "transfusion", "-transfusion", "Transfusion", "basetf", "transfusion" },
+// GAME_GOODVSBAD2
+{ "gvb2", "-goodvsbad2", "GoodVs.Bad2", "rts", "gvb2" },
+// GAME_TEU
+{ "teu", "-teu", "TheEvilUnleashed", "baseteu", "teu" },
+// GAME_BATTLEMECH
+{ "battlemech", "-battlemech", "Battlemech", "base", "battlemech" },
+// GAME_ZYMOTIC
+{ "zymotic", "-zymotic", "Zymotic", "data", "zymotic" },
+// GAME_FNIGGIUM
+{ "fniggium", "-fniggium", "Fniggium", "data", "fniggium" },
+// GAME_SETHERAL
+{ "setheral", "-setheral", "Setheral", "data", "setheral" },
+// GAME_SOM
+{ "som", "-som", "Son of Man", "sonofman", "som" },
+// GAME_TENEBRAE
+{ "tenebrae", "-tenebrae", "DarkPlaces-Tenebrae", "tenebrae", "dp" },
+// GAME_NEOTERIC
+{ "neoteric", "-neoteric", "Neoteric", "neobase", "neo" },
+// GAME_OPENQUARTZ
+{ "openquartz", "-openquartz", "OpenQuartz", "id1", "openquartz"},
+// GAME_PRYDON
+{ "prydon", "-prydon", "PrydonGate", "prydon", "prydon"},
+// GAME_NETHERWORLD
+{ "netherworld", "-netherworld", "Dark Masters", "netherworld", "nw"},
+};
+
void COM_InitGameType (void)
{
- char name[MAX_OSPATH];
+ char name [MAX_OSPATH];
+ unsigned int i;
+
FS_StripExtension (com_argv[0], name, sizeof (name));
COM_ToLowerString (name, name, sizeof (name));
- if (strstr(name, "transfusion"))
- gamemode = GAME_TRANSFUSION;
- else if (strstr(name, "nexuiz"))
- gamemode = GAME_NEXUIZ;
- else if (strstr(name, "nehahra"))
- gamemode = GAME_NEHAHRA;
- else if (strstr(name, "hipnotic"))
- gamemode = GAME_HIPNOTIC;
- else if (strstr(name, "rogue"))
- gamemode = GAME_ROGUE;
- else if (strstr(name, "gvb2"))
- gamemode = GAME_GOODVSBAD2;
- else if (strstr(name, "teu"))
- gamemode = GAME_TEU;
- else if (strstr(name, "battlemech"))
- gamemode = GAME_BATTLEMECH;
- else if (strstr(name, "zymotic"))
- gamemode = GAME_ZYMOTIC;
- else
- gamemode = GAME_NORMAL;
-
- if (COM_CheckParm ("-transfusion"))
- gamemode = GAME_TRANSFUSION;
- else if (COM_CheckParm ("-nexuiz"))
- gamemode = GAME_NEXUIZ;
- else if (COM_CheckParm ("-nehahra"))
- gamemode = GAME_NEHAHRA;
- else if (COM_CheckParm ("-hipnotic"))
- gamemode = GAME_HIPNOTIC;
- else if (COM_CheckParm ("-rogue"))
- gamemode = GAME_ROGUE;
- else if (COM_CheckParm ("-quake"))
- gamemode = GAME_NORMAL;
- else if (COM_CheckParm ("-goodvsbad2"))
- gamemode = GAME_GOODVSBAD2;
- else if (COM_CheckParm ("-teu"))
- gamemode = GAME_TEU;
- else if (COM_CheckParm ("-battlemech"))
- gamemode = GAME_BATTLEMECH;
- else if (COM_CheckParm ("-zymotic"))
- gamemode = GAME_ZYMOTIC;
-
- switch(gamemode)
- {
- case GAME_NORMAL:
- gamename = "DarkPlaces-Quake";
- gamedirname = "";
- break;
- case GAME_HIPNOTIC:
- gamename = "Darkplaces-Hipnotic";
- gamedirname = "hipnotic";
- break;
- case GAME_ROGUE:
- gamename = "Darkplaces-Rogue";
- gamedirname = "rogue";
- break;
- case GAME_NEHAHRA:
- gamename = "DarkPlaces-Nehahra";
- gamedirname = "nehahra";
- break;
- case GAME_NEXUIZ:
- gamename = "Nexuiz";
- gamedirname = "data";
- break;
- case GAME_TRANSFUSION:
- gamename = "Transfusion";
- gamedirname = "transfusion";
- break;
- case GAME_GOODVSBAD2:
- gamename = "GoodVs.Bad2";
- gamedirname = "rts";
- break;
- case GAME_TEU:
- gamename = "TheEvilUnleashed";
- gamedirname = "baseteu";
- break;
- case GAME_BATTLEMECH:
- gamename = "Battlemech";
- gamedirname = "base";
- break;
- case GAME_ZYMOTIC:
- gamename = "Zymotic";
- gamedirname = "data";
- break;
- default:
- Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode);
- break;
- }
+ // Check the binary name; default to GAME_NORMAL (0)
+ gamemode = GAME_NORMAL;
+ for (i = 1; i < sizeof (gamemode_info) / sizeof (gamemode_info[0]); i++)
+ if (strstr (name, gamemode_info[i].prog_name))
+ {
+ gamemode = i;
+ break;
+ }
+
+ // Look for a command-line option
+ for (i = 0; i < sizeof (gamemode_info) / sizeof (gamemode_info[0]); i++)
+ if (COM_CheckParm (gamemode_info[i].cmdline))
+ {
+ gamemode = i;
+ break;
+ }
+
+ gamename = gamemode_info[gamemode].gamename;
+ gamedirname = gamemode_info[gamemode].gamedirname;
+ gamescreenshotname = gamemode_info[gamemode].gamescreenshotname;
}
*/
void COM_Init (void)
{
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
- qbyte swaptest[2] = {1,0};
-
-// set the byte swapping variables in a portable manner
- if ( *(short *)swaptest == 1)
- {
- BigShort = ShortSwap;
- LittleShort = ShortNoSwap;
- BigLong = LongSwap;
- LittleLong = LongNoSwap;
- BigFloat = FloatSwap;
- LittleFloat = FloatNoSwap;
- }
- else
- {
- BigShort = ShortNoSwap;
- LittleShort = ShortSwap;
- BigLong = LongNoSwap;
- LittleLong = LongSwap;
- BigFloat = FloatNoSwap;
- LittleFloat = FloatSwap;
- }
-#endif
-
Cvar_RegisterVariable (®istered);
Cvar_RegisterVariable (&cmdline);
Mathlib_Init();
FS_Init ();
- Con_InitLogging();
+ Log_Init ();
COM_CheckRegistered ();
-
- COM_InitGameType();
}
return true;
}
-int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize)
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize, const char *commentprefix)
{
- int argc;
+ int argc, commentprefixlength;
char *tokenbufend;
const char *l;
argc = 0;
tokenbufend = tokenbuf + tokenbufsize;
l = *text;
+ commentprefixlength = 0;
+ if (commentprefix)
+ commentprefixlength = strlen(commentprefix);
while (*l && *l != '\n')
{
if (*l > ' ')
{
+ if (commentprefixlength && !strncmp(l, commentprefix, commentprefixlength))
+ {
+ while (*l && *l != '\n')
+ l++;
+ break;
+ }
if (argc >= maxargc)
return -1;
argv[argc++] = tokenbuf;
/* $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $ */
-// Most (all?) BSDs already have them
-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-
+#ifndef HAVE_STRLCAT
size_t
strlcat(char *dst, const char *src, size_t siz)
{
return(dlen + (s - src)); /* count does not include NUL */
}
+#endif // #ifndef HAVE_STRLCAT
+
+#ifndef HAVE_STRLCPY
size_t
strlcpy(char *dst, const char *src, size_t siz)
{
return(s - src - 1); /* count does not include NUL */
}
-#endif // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#endif // #ifndef HAVE_STRLCPY