#include "portab.h"
-static char UNUSED id[] = "$Id: client.c,v 1.67 2002/12/22 23:29:09 alex Exp $";
+static char UNUSED id[] = "$Id: client.c,v 1.68 2002/12/26 16:25:43 alex Exp $";
#include "imp.h"
#include <assert.h>
assert( Client != NULL );
assert( Hostname != NULL );
- strncpy( Client->host, Hostname, CLIENT_HOST_LEN - 1 );
- Client->host[CLIENT_HOST_LEN - 1] = '\0';
+ strlcpy( Client->host, Hostname, sizeof( Client->host ));
} /* Client_SetHostname */
assert( Client != NULL );
assert( ID != NULL );
- strncpy( Client->id, ID, CLIENT_ID_LEN - 1 );
- Client->id[CLIENT_ID_LEN - 1] = '\0';
+ strlcpy( Client->id, ID, sizeof( Client->id ));
/* Hash */
Client->hash = Hash( Client->id );
assert( Client != NULL );
assert( User != NULL );
- if( Idented ) strncpy( Client->user, User, CLIENT_USER_LEN - 1 );
+ if( Idented ) strlcpy( Client->user, User, sizeof( Client->user ));
else
{
Client->user[0] = '~';
- strncpy( Client->user + 1, User, CLIENT_USER_LEN - 2 );
+ strlcpy( Client->user + 1, User, sizeof( Client->user ) - 1 );
}
- Client->user[CLIENT_USER_LEN - 1] = '\0';
} /* Client_SetUser */
assert( Client != NULL );
assert( Info != NULL );
- strncpy( Client->info, Info, CLIENT_INFO_LEN - 1 );
- Client->info[CLIENT_INFO_LEN - 1] = '\0';
+ strlcpy( Client->info, Info, sizeof( Client->info ));
} /* Client_SetInfo */
assert( Client != NULL );
assert( Modes != NULL );
- strncpy( Client->modes, Modes, CLIENT_MODE_LEN - 1 );
- Client->modes[CLIENT_MODE_LEN - 1] = '\0';
+ strlcpy( Client->modes, Modes, sizeof( Client->modes ));
} /* Client_SetModes */
assert( Client != NULL );
assert( Flags != NULL );
- strncpy( Client->flags, Flags, CLIENT_FLAGS_LEN - 1 );
- Client->flags[CLIENT_FLAGS_LEN - 1] = '\0';
+ strlcpy( Client->flags, Flags, sizeof( Client->flags ));
} /* Client_SetFlags */
assert( Client != NULL );
assert( Pwd != NULL );
- strncpy( Client->pwd, Pwd, CLIENT_PASS_LEN - 1 );
- Client->pwd[CLIENT_PASS_LEN - 1] = '\0';
+ strlcpy( Client->pwd, Pwd, sizeof( Client->pwd ));
} /* Client_SetPassword */
if( Txt )
{
/* Client AWAY setzen */
- strncpy( Client->away, Txt, CLIENT_AWAY_LEN - 1 );
- Client->away[CLIENT_AWAY_LEN - 1] = '\0';
+ strlcpy( Client->away, Txt, sizeof( Client->away ));
Client_ModeAdd( Client, 'a' );
Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
}
assert( Nick != NULL );
/* Nick kopieren und ggf. Host-Mask abschneiden */
- strncpy( search_id, Nick, CLIENT_ID_LEN - 1 );
- search_id[CLIENT_ID_LEN - 1] = '\0';
+ strlcpy( search_id, Nick, sizeof( search_id ));
ptr = strchr( search_id, '!' );
if( ptr ) *ptr = '\0';