diff options
| -rw-r--r-- | src/ngircd/channel.c | 4 | ||||
| -rw-r--r-- | src/ngircd/conf.c | 4 | ||||
| -rw-r--r-- | src/ngircd/log.c | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 56029195..1b7963a2 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -17,7 +17,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: channel.c,v 1.48 2005/06/04 11:53:25 fw Exp $"; +static char UNUSED id[] = "$Id: channel.c,v 1.49 2005/06/17 19:16:53 fw Exp $"; #include "imp.h" #include <assert.h> @@ -468,7 +468,7 @@ Channel_IsValidName( char *Name ) if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false; ptr = Name; - strcpy( badchars, " ,:\007" ); + badchars[0] = '\0'; while( *ptr ) { if( strchr( badchars, *ptr )) return false; diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 328bbff0..77e52cb6 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.76 2005/04/16 09:23:01 fw Exp $"; +static char UNUSED id[] = "$Id: conf.c,v 1.77 2005/06/17 19:16:53 fw Exp $"; #include "imp.h" #include <assert.h> @@ -346,7 +346,7 @@ Set_Defaults( bool InitServers ) int i; strcpy( Conf_ServerName, "" ); - sprintf( Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION ); + snprintf( Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION ); strcpy( Conf_ServerPwd, "" ); strcpy( Conf_ServerAdmin1, "" ); diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 3cb394bd..6bc9250a 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: log.c,v 1.54 2005/04/16 09:31:30 fw Exp $"; +static char UNUSED id[] = "$Id: log.c,v 1.55 2005/06/17 19:16:53 fw Exp $"; #include "imp.h" #include <assert.h> @@ -76,24 +76,24 @@ Log_Init( void ) #ifdef DEBUG if( NGIRCd_Debug ) { - strcpy( Init_Txt, "debug-mode" ); + strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt ); } #endif if( NGIRCd_NoDaemon ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "no-daemon-mode" ); + if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt ); + strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt ); } if( NGIRCd_Passive ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "passive-mode" ); + if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt ); + strlcat( Init_Txt, "passive-mode", sizeof Init_Txt ); } #ifdef SNIFFER if( NGIRCd_Sniffer ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "network sniffer" ); + if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt ); + strlcat( Init_Txt, "network sniffer", sizeof Init_Txt ); } #endif if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); @@ -113,7 +113,7 @@ Log_InitErrorfile( void ) * landen z.B. alle Ausgaben von assert()-Aufrufen. */ /* Dateiname zusammen bauen */ - sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); + snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); /* stderr umlenken */ fflush( stderr ); |