Mercurial > hg > openttd
changeset 2831:c044e97c6846 draft
(svn r3379) -Fix: protect showhelp against any possible overflow
-Add: [ FS#15 ] Added revision / version at top of help (./openttd -h)
author | truelight <truelight@openttd.org> |
---|---|
date | Fri, 06 Jan 2006 22:52:31 +0000 |
parents | c24013761c37 |
children | c3a70c191b55 |
files | driver.c driver.h openttd.c |
diffstat | 3 files changed, 28 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/driver.c +++ b/driver.c @@ -206,16 +206,23 @@ } -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; }
--- a/driver.h +++ b/driver.h @@ -8,6 +8,6 @@ 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 */
--- a/openttd.c +++ b/openttd.c @@ -115,11 +115,21 @@ 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 @@ #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); }