#include "portab.h"
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.24 2002/12/18 14:16:21 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.27 2002/12/26 17:14:48 alex Exp $";
#include "imp.h"
#include <assert.h>
else
{
/* Append modifier character to result string */
- x[0] = *mode_ptr; strcat( the_modes, x );
+ x[0] = *mode_ptr;
+ strlcat( the_modes, x, sizeof( the_modes ));
}
if( *mode_ptr == '+' ) set = TRUE;
else set = FALSE;
if( set )
{
/* Set mode */
- if( Client_ModeAdd( Target, x[0] )) strcat( the_modes, x );
+ if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
}
else
{
/* Unset mode */
- if( Client_ModeDel( Target, x[0] )) strcat( the_modes, x );
+ if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
}
}
client_exit:
else
{
/* Append modifier character to result string */
- x[0] = *mode_ptr; strcat( the_modes, x );
+ x[0] = *mode_ptr;
+ strlcat( the_modes, x, sizeof( the_modes ));
}
if( *mode_ptr == '+' ) set = TRUE;
else set = FALSE;
{
Channel_ModeDel( Channel, 'k' );
Channel_SetKey( Channel, Req->argv[arg_arg] );
- strcpy( argadd, Channel_Key( Channel ));
+ strlcpy( argadd, Channel_Key( Channel ), sizeof( argadd ));
x[0] = *mode_ptr;
}
else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
{
Channel_ModeDel( Channel, 'l' );
Channel_SetMaxUsers( Channel, l );
- sprintf( argadd, "%ld", l );
+ snprintf( argadd, sizeof( argadd ), "%ld", l );
x[0] = *mode_ptr;
}
}
/* Channel-User-Mode */
if( Channel_UserModeAdd( Channel, client, x[0] ))
{
- strcat( the_args, Client_ID( client ));
- strcat( the_args, " " ); strcat( the_modes, x );
+ strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+ strlcat( the_args, " ", sizeof( the_args ));
+ strlcat( the_modes, x, sizeof( the_modes ));
Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
}
}
/* Channel-Mode */
if( Channel_ModeAdd( Channel, x[0] ))
{
- strcat( the_modes, x );
+ strlcat( the_modes, x, sizeof( the_modes ));
Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
}
}
/* Channel-User-Mode */
if( Channel_UserModeDel( Channel, client, x[0] ))
{
- strcat( the_args, Client_ID( client ));
- strcat( the_args, " " ); strcat( the_modes, x );
+ strlcat( the_args, Client_ID( client ), sizeof( the_args ));
+ strlcat( the_args, " ", sizeof( the_args ));
+ strlcat( the_modes, x, sizeof( the_modes ));
Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client ));
}
}
/* Channel-Mode */
if( Channel_ModeDel( Channel, x[0] ))
{
- strcat( the_modes, x );
+ strlcat( the_modes, x, sizeof( the_modes ));
Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel ));
}
}
/* Are there additional arguments to add? */
if( argadd[0] )
{
- if( the_args[strlen( the_args ) - 1] != ' ' ) strcat( the_args, " " );
- strcat( the_args, argadd );
+ if( the_args[strlen( the_args ) - 1] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
+ strlcat( the_args, argadd, sizeof( the_args ));
}
}
chan_exit: