summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/irc/irc-mode.c244
-rw-r--r--src/plugins/irc/irc-mode.h3
-rw-r--r--src/plugins/irc/irc-modelist.c3
-rw-r--r--src/plugins/irc/irc-protocol.c9
4 files changed, 126 insertions, 133 deletions
diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c
index c86f36e47..56a3b5c3d 100644
--- a/src/plugins/irc/irc-mode.c
+++ b/src/plugins/irc/irc-mode.c
@@ -320,11 +320,13 @@ int
irc_mode_channel_set (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *host,
- const char *modes)
+ const char *modes,
+ const char *modes_arguments)
{
- char *pos_args, *str_modes, set_flag, **argv, *pos, *ptr_arg, chanmode_type;
+ const char *pos, *ptr_arg;
+ char set_flag, **argv, chanmode_type;
int argc, current_arg, update_channel_modes, channel_modes_updated;
- int smart_filter;
+ int smart_filter, end_modes;
struct t_irc_nick *ptr_nick;
struct t_irc_modelist *ptr_modelist;
struct t_irc_modelist_item *ptr_item;
@@ -335,23 +337,8 @@ irc_mode_channel_set (struct t_irc_server *server,
channel_modes_updated = 0;
argc = 0;
argv = NULL;
- pos_args = strchr (modes, ' ');
- if (pos_args)
- {
- str_modes = weechat_strndup (modes, pos_args - modes);
- if (!str_modes)
- return 0;
- pos_args++;
- while (pos_args[0] == ' ')
- pos_args++;
- argv = weechat_string_split (pos_args, " ", 0, 0, &argc);
- }
- else
- {
- str_modes = strdup (modes);
- if (!str_modes)
- return 0;
- }
+ if (modes_arguments)
+ argv = weechat_string_split (modes_arguments, " ", 0, 0, &argc);
current_arg = 0;
@@ -359,119 +346,122 @@ irc_mode_channel_set (struct t_irc_server *server,
&& weechat_config_string (irc_config_look_smart_filter_mode)
&& weechat_config_string (irc_config_look_smart_filter_mode)[0]) ? 1 : 0;
- if (str_modes && str_modes[0])
+ end_modes = 0;
+ set_flag = '+';
+ pos = modes;
+ while (pos[0])
{
- set_flag = '+';
- pos = str_modes;
- while (pos && pos[0])
+ switch (pos[0])
{
- switch (pos[0])
- {
- case ':':
- case ' ':
- break;
- case '+':
- set_flag = '+';
- break;
- case '-':
- set_flag = '-';
- break;
- default:
- update_channel_modes = 1;
- chanmode_type = irc_mode_get_chanmode_type (server, pos[0]);
- ptr_arg = NULL;
- switch (chanmode_type)
- {
- case 'A': /* always argument */
- update_channel_modes = 0;
- ptr_arg = (current_arg < argc) ?
- argv[current_arg] : NULL;
- break;
- case 'B': /* always argument */
- ptr_arg = (current_arg < argc) ?
- argv[current_arg] : NULL;
- break;
- case 'C': /* argument if set */
- ptr_arg = ((set_flag == '+') && (current_arg < argc)) ?
- argv[current_arg] : NULL;
- break;
- case 'D': /* no argument */
- break;
- }
- if (ptr_arg)
- current_arg++;
+ case ':':
+ break;
+ case ' ':
+ end_modes = 1;
+ break;
+ case '+':
+ set_flag = '+';
+ break;
+ case '-':
+ set_flag = '-';
+ break;
+ default:
+ update_channel_modes = 1;
+ chanmode_type = irc_mode_get_chanmode_type (server, pos[0]);
+ ptr_arg = NULL;
+ switch (chanmode_type)
+ {
+ case 'A': /* always argument */
+ update_channel_modes = 0;
+ ptr_arg = (current_arg < argc) ?
+ argv[current_arg] : NULL;
+ break;
+ case 'B': /* always argument */
+ ptr_arg = (current_arg < argc) ?
+ argv[current_arg] : NULL;
+ break;
+ case 'C': /* argument if set */
+ ptr_arg = ((set_flag == '+') && (current_arg < argc)) ?
+ argv[current_arg] : NULL;
+ break;
+ case 'D': /* no argument */
+ break;
+ }
+ if (ptr_arg)
+ current_arg++;
- if (smart_filter
- && !irc_mode_smart_filtered (server, pos[0]))
- {
- smart_filter = 0;
- }
+ if (smart_filter
+ && !irc_mode_smart_filtered (server, pos[0]))
+ {
+ smart_filter = 0;
+ }
- if (pos[0] == 'k')
+ if (pos[0] == 'k')
+ {
+ /* channel key */
+ if (set_flag == '-')
{
- /* channel key */
- if (set_flag == '-')
+ if (channel->key)
{
- if (channel->key)
- {
- free (channel->key);
- channel->key = NULL;
- }
- }
- else if ((set_flag == '+')
- && ptr_arg && (strcmp (ptr_arg, "*") != 0))
- {
- /* replace key for +k, but ignore "*" as new key */
- if (channel->key)
- free (channel->key);
- channel->key = strdup (ptr_arg);
+ free (channel->key);
+ channel->key = NULL;
}
}
- else if (pos[0] == 'l')
+ else if ((set_flag == '+')
+ && ptr_arg && (strcmp (ptr_arg, "*") != 0))
{
- /* channel limit */
- if (set_flag == '-')
- channel->limit = 0;
- if ((set_flag == '+') && ptr_arg)
- {
- channel->limit = atoi (ptr_arg);
- }
+ /* replace key for +k, but ignore "*" as new key */
+ if (channel->key)
+ free (channel->key);
+ channel->key = strdup (ptr_arg);
}
- else if ((chanmode_type != 'A')
- && (irc_server_get_prefix_mode_index (server,
- pos[0]) >= 0))
+ }
+ else if (pos[0] == 'l')
+ {
+ /* channel limit */
+ if (set_flag == '-')
+ channel->limit = 0;
+ if ((set_flag == '+') && ptr_arg)
{
- /* mode for nick */
- update_channel_modes = 0;
- if (ptr_arg)
+ channel->limit = atoi (ptr_arg);
+ }
+ }
+ else if ((chanmode_type != 'A')
+ && (irc_server_get_prefix_mode_index (server,
+ pos[0]) >= 0))
+ {
+ /* mode for nick */
+ update_channel_modes = 0;
+ if (ptr_arg)
+ {
+ ptr_nick = irc_nick_search (server, channel,
+ ptr_arg);
+ if (ptr_nick)
{
- ptr_nick = irc_nick_search (server, channel,
- ptr_arg);
- if (ptr_nick)
+ irc_nick_set_mode (server, channel, ptr_nick,
+ (set_flag == '+'), pos[0]);
+ /*
+ * disable smart filtering if mode is sent
+ * to me, or based on the nick speaking time
+ */
+ if (smart_filter
+ && ((irc_server_strcasecmp (server,
+ ptr_nick->name,
+ server->nick) == 0)
+ || irc_channel_nick_speaking_time_search (server,
+ channel,
+ ptr_nick->name,
+ 1)))
{
- irc_nick_set_mode (server, channel, ptr_nick,
- (set_flag == '+'), pos[0]);
- /*
- * disable smart filtering if mode is sent
- * to me, or based on the nick speaking time
- */
- if (smart_filter
- && ((irc_server_strcasecmp (server,
- ptr_nick->name,
- server->nick) == 0)
- || irc_channel_nick_speaking_time_search (server,
- channel,
- ptr_nick->name,
- 1)))
- {
- smart_filter = 0;
- }
+ smart_filter = 0;
}
}
}
- else if (chanmode_type == 'A')
+ }
+ else if (chanmode_type == 'A')
+ {
+ /* modelist modes */
+ if (ptr_arg)
{
- /* modelist modes */
ptr_modelist = irc_modelist_search (channel, pos[0]);
if (ptr_modelist)
{
@@ -489,21 +479,21 @@ irc_mode_channel_set (struct t_irc_server *server,
}
}
}
+ }
- if (update_channel_modes)
- {
- irc_mode_channel_update (server, channel, set_flag,
- pos[0], ptr_arg);
- channel_modes_updated = 1;
- }
- break;
- }
- pos++;
+ if (update_channel_modes)
+ {
+ irc_mode_channel_update (server, channel, set_flag,
+ pos[0], ptr_arg);
+ channel_modes_updated = 1;
+ }
+ break;
}
+ if (end_modes)
+ break;
+ pos++;
}
- if (str_modes)
- free (str_modes);
if (argv)
weechat_string_free_split (argv);
diff --git a/src/plugins/irc/irc-mode.h b/src/plugins/irc/irc-mode.h
index 8529ae5e5..bb7982475 100644
--- a/src/plugins/irc/irc-mode.h
+++ b/src/plugins/irc/irc-mode.h
@@ -28,7 +28,8 @@ extern char irc_mode_get_chanmode_type (struct t_irc_server *server,
extern int irc_mode_channel_set (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *host,
- const char *modes);
+ const char *modes,
+ const char *modes_arguments);
extern void irc_mode_user_set (struct t_irc_server *server, const char *modes,
int reset_modes);
diff --git a/src/plugins/irc/irc-modelist.c b/src/plugins/irc/irc-modelist.c
index 16083e488..1ad2ee3a8 100644
--- a/src/plugins/irc/irc-modelist.c
+++ b/src/plugins/irc/irc-modelist.c
@@ -257,6 +257,9 @@ irc_modelist_item_new (struct t_irc_modelist *modelist,
{
struct t_irc_modelist_item *new_item;
+ if (!mask)
+ return NULL;
+
/* alloc memory for new item */
if ((new_item = malloc (sizeof (*new_item))) == NULL)
{
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index eca3c59aa..f93528449 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -1398,9 +1398,8 @@ IRC_PROTOCOL_CALLBACK(mode)
IRC_PROTOCOL_CHECK_HOST;
pos_modes = (argv[3][0] == ':') ? argv[3] + 1 : argv[3];
- pos_modes_args = NULL;
- if (argc > 4)
- pos_modes_args = (argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4];
+ pos_modes_args = (argc > 4) ?
+ ((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : NULL;
if (irc_channel_is_channel (server, argv[2]))
{
@@ -1409,7 +1408,7 @@ IRC_PROTOCOL_CALLBACK(mode)
if (ptr_channel)
{
smart_filter = irc_mode_channel_set (server, ptr_channel, host,
- pos_modes);
+ pos_modes, pos_modes_args);
}
local_mode = (irc_server_strcasecmp (server, nick, server->nick) == 0);
ptr_nick = irc_nick_search (server, ptr_channel, nick);
@@ -3546,7 +3545,7 @@ IRC_PROTOCOL_CALLBACK(324)
if (argc > 4)
{
(void) irc_mode_channel_set (server, ptr_channel, host,
- ptr_channel->modes);
+ ptr_modes, NULL);
}
}
if (!ptr_channel
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 20:27:09 +0000