summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-02-03 18:24:22 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-02-03 18:24:22 +0000
commitaa544dec32d57c8f6a33e2c27d711cff2e8c0f88 (patch)
treeb47250835b8fba084cfd32ced81e9c79de9bc757 /src
parent78542cb0f7e8c67c6292f18aa4063a9c0b773387 (diff)
downloadirssi-aa544dec32d57c8f6a33e2c27d711cff2e8c0f88.zip
Added PARAM_FLAG_OPTCHAN_NAME which is like PARAM_FLAG_OPTCHAN, but doesn't
allow using "*" to specify active channel. Used with /OP, /DEOP, /VOICE and /DEVOICE so you can do /OP * again :) git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2380 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src')
-rw-r--r--src/core/commands.c10
-rw-r--r--src/core/commands.h2
-rw-r--r--src/irc/core/modes.c2
3 files changed, 9 insertions, 5 deletions
diff --git a/src/core/commands.c b/src/core/commands.c
index 9764a135..3cb0897f 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -640,7 +640,8 @@ typedef struct {
GHashTable *options;
} CMD_TEMP_REC;
-static char *get_optional_channel(WI_ITEM_REC *active_item, char **data)
+static char *get_optional_channel(WI_ITEM_REC *active_item, char **data,
+ int require_name)
{
CHANNEL_REC *chanrec;
char *tmp, *origtmp, *channel, *ret;
@@ -653,7 +654,7 @@ static char *get_optional_channel(WI_ITEM_REC *active_item, char **data)
origtmp = tmp = g_strdup(*data);
channel = cmd_get_param(&tmp);
- if (strcmp(channel, "*") == 0) {
+ if (strcmp(channel, "*") == 0 && !require_name) {
/* "*" means active channel */
cmd_get_param(data);
ret = active_item->name;
@@ -680,7 +681,7 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...)
GHashTable **opthash;
char **str, *arg, *datad;
va_list args;
- int cnt, error, ignore_unknown;
+ int cnt, error, ignore_unknown, require_name;
g_return_val_if_fail(data != NULL, FALSE);
@@ -714,7 +715,8 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...)
cnt = PARAM_WITHOUT_FLAGS(count);
if (count & PARAM_FLAG_OPTCHAN) {
/* optional channel as first parameter */
- arg = get_optional_channel(item, &datad);
+ require_name = (count & PARAM_FLAG_OPTCHAN_NAME);
+ arg = get_optional_channel(item, &datad, require_name);
str = (char **) va_arg(args, char **);
if (str != NULL) *str = arg;
diff --git a/src/core/commands.h b/src/core/commands.h
index 86446cd8..3e55a2ad 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -135,6 +135,8 @@ int command_have_option(const char *cmd, const char *option);
#define PARAM_FLAG_UNKNOWN_OPTIONS 0x00008000
/* optional channel in first argument */
#define PARAM_FLAG_OPTCHAN 0x00010000
+/* optional channel in first argument, but don't treat "*" as current channel */
+#define PARAM_FLAG_OPTCHAN_NAME 0x00030000
char *cmd_get_param(char **data);
/* get parameters from command - you should point free_me somewhere and
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index e3f98328..3ad8abd2 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -591,7 +591,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
void *free_arg;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
- PARAM_FLAG_OPTCHAN, item, &channame, &nicks))
+ PARAM_FLAG_OPTCHAN_NAME, item, &channame, &nicks))
return NULL;
if (*nicks == '\0')