zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-17 07:32:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Channel mode handling changed - there's no more mode_xxx fields in

Browse source 
channel structure, but instead just one mode string field. Also
handling half-ops (+h) should work right.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@617 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-08-20 07:17:13 +00:00 • committed by cras
commit 67cc9af1bd
15 changed files with 351 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/irc/core/masks.c
View file

@ -39,11 +39,17 @@ static int check_mask(const char *mask, int *wildcards)
return FALSE;
}
int irc_mask_match(const char *mask, const char *nick, const char *user, const char *host)
int irc_mask_match(const char *mask, const char *nick,
const char *user, const char *host)
{
char *str;
int ret, wildcards;
g_return_val_if_fail(mask != NULL, FALSE);
g_return_val_if_fail(nick != NULL, FALSE);
g_return_val_if_fail(user != NULL, FALSE);
g_return_val_if_fail(host != NULL, FALSE);
if (!check_mask(mask, &wildcards)) {
return wildcards ?
match_wildcards(mask, nick) :
@ -57,12 +63,14 @@ int irc_mask_match(const char *mask, const char *nick, const char *user, const c
return ret;
}
int irc_mask_match_address(const char *mask, const char *nick, const char *address)
int irc_mask_match_address(const char *mask, const char *nick,
const char *address)
{
char *str;
int ret, wildcards;
g_return_val_if_fail(address != NULL, FALSE);
g_return_val_if_fail(mask != NULL, FALSE);
g_return_val_if_fail(nick != NULL, FALSE);
if (!check_mask(mask, &wildcards)) {
return wildcards ?
@ -70,7 +78,7 @@ int irc_mask_match_address(const char *mask, const char *nick, const char *addre
g_strcasecmp(mask, nick) == 0;
}
str = g_strdup_printf("%s!%s", nick, address);
str = g_strdup_printf("%s!%s", nick, address != NULL ? address : "");
ret = match_wildcards(mask, str);
g_free(str);
@ -136,7 +144,8 @@ char *irc_get_mask(const char *nick, const char *address, int flags)
char *ret, *user, *host;
/* strip -, ^ or ~ from start.. */
user = g_strconcat("*", ishostflag(*address) ? address+1 : address, NULL);
user = g_strconcat("*", ishostflag(*address) ?
address+1 : address, NULL);
/* split user and host */
host = strchr(user, '@');