mirror of
https://github.com/irssi/irssi.git
synced 2026-08-09 11:50:10 +02:00
Merge pull request #350 from LemonBoy/fix-99
Strip trailing whitespace from commands
This commit is contained in:
commit
fbb838b3b0
14 changed files with 42 additions and 26 deletions
|
|
@ -757,7 +757,7 @@ static void cmd_completion(const char *data)
|
|||
int len;
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
|
||||
PARAM_FLAG_GETREST,
|
||||
PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
|
||||
"completion", &optlist, &key, &value))
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,8 @@ static void cmd_join(const char *data, SERVER_REC *server)
|
|||
void *free_arg;
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
|
||||
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
|
||||
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST |
|
||||
PARAM_FLAG_STRIP_TRAILING_WS,
|
||||
"join", &optlist, &pdata))
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,8 @@ static void cmd_ignore(const char *data)
|
|||
return;
|
||||
}
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
|
||||
PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
|
||||
"ignore", &optlist, &mask, &levels))
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -87,8 +87,9 @@ static void cmd_log_open(const char *data)
|
|||
int level;
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
|
||||
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS,
|
||||
"log open", &optlist, &fname, &levels))
|
||||
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS |
|
||||
PARAM_FLAG_STRIP_TRAILING_WS, "log open", &optlist,
|
||||
&fname, &levels))
|
||||
return;
|
||||
if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,8 @@ static void cmd_set(char *data)
|
|||
int clear, set_default;
|
||||
SETTINGS_REC *rec;
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
|
||||
PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
|
||||
"set", &optlist, &key, &value))
|
||||
return;
|
||||
|
||||
|
|
@ -182,7 +183,7 @@ static void cmd_toggle(const char *data)
|
|||
void *free_arg;
|
||||
int type;
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &key, &value))
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &key, &value))
|
||||
return;
|
||||
|
||||
if (*key == '\0')
|
||||
|
|
|
|||
|
|
@ -246,8 +246,8 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server,
|
|||
|
||||
CMD_IRC_SERVER(server);
|
||||
|
||||
if (!cmd_get_params(data, &free_arg, 2 |
|
||||
PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST,
|
||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN |
|
||||
PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
|
||||
item, &channel, &nicks))
|
||||
return;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue