--- src/main.c.orig Thu Dec 24 06:24:50 1998 +++ src/main.c Sat Sep 17 13:24:27 2005 @@ -319,40 +319,27 @@ /* lvprintf( priority, same as printf ) - Logs to the log IF priority is smaller */ /* or equal to game.verbose */ -void lvprintf(va_alist) -va_dcl +void lvprintf(int priority, char *format, ...) { /* No bounds checking. Be very careful what you log */ - char *format; va_list va; static char SBUF2[768];int priority; - va_start(va); - priority=va_arg(va,int);format=va_arg(va,char *); - vsprintf(SBUF2,format,va); - if (strlen(SBUF2)>512) - { - SBUF2[512]=0; /* truncate string. Of course, by now we have buffer overrun ;) */ - } - - if (priority <= game.verbose) + if (priority <= game.verbose) { + va_list va; static char SBUF2[768]; + va_start(va, format); + vsnprintf(SBUF2, sizeof(SBUF2),format,va); lprintf(SBUF2); - - va_end(va); + va_end(va); + } } /* lprintf( same as printf ) - Logs to the log. */ -void lprintf(va_alist) -va_dcl +void lprintf(char *format, ...) { /* No bounds checking. Be very careful what you log */ - char *format; va_list va; static char SBUF2[768]; + va_list va; static char SBUF2[768]; FILE *file_out; char *mytime; char *P; time_t cur_time; - va_start(va); - format=va_arg(va,char *); - vsprintf(SBUF2,format,va); - if (strlen(SBUF2)>512) - { - SBUF2[512]=0; /* truncate string. Of course, by now we have buffer overrun ;) */ - } + va_start(va, format); + vsnprintf(SBUF2, sizeof(SBUF2),format,va); file_out = fopen(FILE_LOG,"a"); if (file_out != NULL) @@ -2462,7 +2449,7 @@ /* Winlist - Returns Winlist */ if (!strcasecmp(buf,"getwinlist")) { - lvprintf("%s: GetWinlist request\n",n->host); + lprintf("%s: GetWinlist request\n",n->host); for(i=0;i