gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-22 15:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3379) -Fix: protect showhelp against any possible overflow

Browse Source 
-Add: [ FS#15 ] Added revision / version at top of help (./openttd -h)
This commit is contained in:
truelight 2006-01-06 22:52:31 +00:00
parent 79ce0def50
commit 835cd6ea28
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
driver.c
View File

@ -206,16 +206,23 @@ int GetDriverParamInt(const char* const* parm, const char* name, int def)
}
void GetDriverList(char* p)
int GetDriverList(char* p, int size)
{
const DriverClass* dc;
int pos;
for (dc = _driver_classes; dc != endof(_driver_classes); dc++) {
const DriverDesc* dd;
p += sprintf(p, "List of %s drivers:\n", dc->name);
pos = snprintf(p, size, "List of %s drivers:\n", dc->name);
p += pos; size -= pos;
for (dd = dc->descs; dd->name != NULL; dd++) {
p += sprintf(p, "%10s: %s\n", dd->name, dd->longname);
pos = snprintf(p, size, "%10s: %s\n", dd->name, dd->longname);
p += pos; size -= pos;
}
pos = snprintf(p, size, "\n");
p += pos; size -= pos;
}
return size;
}

2
driver.h
View File

@ -8,6 +8,6 @@ void LoadDriver(int driver, const char *name);
bool GetDriverParamBool(const char* const* parm, const char* name);
int GetDriverParamInt(const char* const* parm, const char* name, int def);
void GetDriverList(char* p);
int GetDriverList(char* p, int size);
#endif /* DRIVER_H */

23
openttd.c
View File

@ -115,11 +115,21 @@ void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
return mem;
}
extern const char _openttd_revision[];
static void showhelp(void)
{
char buf[4096], *p;
int size, pos;
p = strecpy(buf,
p = buf;
size = sizeof(buf);
pos = snprintf(p, size, "OpenTTD %s\n", _openttd_revision);
p += pos; size -= pos;
pos = snprintf(p, size,
"\n"
"\n"
"Command line options:\n"
" -v drv = Set video driver (see below)\n"
" -s drv = Set sound driver (see below)\n"
@ -136,13 +146,14 @@ static void showhelp(void)
#if !defined(__MORPHOS__) && !defined(__AMIGA__)
" -f = Fork into the background (dedicated only)\n"
#endif
" -i = Force to use the DOS palette (use this if you see a lot of pink)\n"
" -p #player = Player as #player (deprecated) (network only)\n"
" -c config_file = Use 'config_file' instead of 'openttd.cfg'\n",
lastof(buf)
" -i = Force to use the DOS palette\n"
" (use this if you see a lot of pink)\n"
" -c config_file = Use 'config_file' instead of 'openttd.cfg'\n"
"\n"
);
p += pos; size -= pos;
GetDriverList(p);
size = GetDriverList(p, size);
ShowInfo(buf);
}