#include "portab.h"
-static char UNUSED id[] = "$Id: channel.c,v 1.39 2002/12/25 13:22:43 alex Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.41 2002/12/26 16:48:14 alex Exp $";
#include "imp.h"
#include <assert.h>
if( ! strchr( Chan->modes, x[0] ))
{
/* Client hat den Mode noch nicht -> setzen */
- strcat( Chan->modes, x );
+ strlcat( Chan->modes, x, sizeof( Chan->modes ));
return TRUE;
}
else return FALSE;
if( ! strchr( cl2chan->modes, x[0] ))
{
/* Client hat den Mode noch nicht -> setzen */
- strcat( cl2chan->modes, x );
+ strlcat( cl2chan->modes, x, sizeof( cl2chan->modes ));
return TRUE;
}
else return FALSE;
assert( Chan != NULL );
assert( Topic != NULL );
- strncpy( Chan->topic, Topic, CHANNEL_TOPIC_LEN - 1 );
- Chan->topic[CHANNEL_TOPIC_LEN - 1] = '\0';
+ strlcpy( Chan->topic, Topic, sizeof( Chan->topic ));
} /* Channel_SetTopic */
assert( Chan != NULL );
assert( Modes != NULL );
- strncpy( Chan->modes, Modes, CHANNEL_MODE_LEN - 1 );
- Chan->topic[CHANNEL_MODE_LEN - 1] = '\0';
+ strlcpy( Chan->modes, Modes, sizeof( Chan->modes ));
} /* Channel_SetModes */
assert( Chan != NULL );
assert( Key != NULL );
- strncpy( Chan->key, Key, CLIENT_PASS_LEN - 1 );
- Chan->key[CLIENT_PASS_LEN - 1] = '\0';
+ strlcpy( Chan->key, Key, sizeof( Chan->key ));
Log( LOG_DEBUG, "Channel %s: Key is now \"%s\".", Chan->name, Chan->key );
} /* Channel_SetKey */
return NULL;
}
c->next = NULL;
- strncpy( c->name, Name, CHANNEL_NAME_LEN - 1 );
+ strlcpy( c->name, Name, sizeof( c->name ));
c->name[CHANNEL_NAME_LEN - 1] = '\0';
strcpy( c->modes, "" );
strcpy( c->topic, "" );