foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added control of alias when config file is loaded

v2.8-utf8proc
Sebastien Helleu 2003-10-03 19:50:37 +00:00
parent cec899898a
commit 3782ef828a
6 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -93,6 +93,7 @@ Future versions:
* Configuration:
- add key bindings to config file
- add missing options for config file
- wrong alias is not created and not saved when quitting WeeChat
* Plugins:
- add Perl plugin

50
src/command.c
View File

@ -324,8 +324,33 @@ alias_insert_sorted (t_weechat_alias *alias)
t_weechat_alias *
alias_new (char *alias_name, char *alias_command)
{
char *pos;
t_weechat_alias *new_alias;
if (index_command_search (alias_name))
{
gui_printf (NULL, _("%s alias or command \"%s\" already exists!\n"),
WEECHAT_ERROR, alias_name);
return NULL;
}
pos = strchr (alias_command, ' ');
if (pos)
pos[0] = '\0';
if (alias_search (alias_command))
{
gui_printf (NULL, _("%s alias cannot run another alias!\n"),
WEECHAT_ERROR);
return NULL;
}
if (!index_command_search (alias_command))
{
gui_printf (NULL, _("%s target command \"%s\" does not exist!\n"),
WEECHAT_ERROR, pos);
return NULL;
}
if (pos)
pos[0] = ' ';
if ((new_alias = ((t_weechat_alias *) malloc (sizeof (t_weechat_alias)))))
{
new_alias->alias_name = strdup (alias_name);
@ -710,7 +735,7 @@ user_command (t_irc_server *server, char *command)
int
weechat_cmd_alias (char *arguments)
{
char *pos, *pos2;
char *pos;
t_weechat_alias *ptr_alias;
if (arguments && arguments[0])
@ -729,29 +754,6 @@ weechat_cmd_alias (char *arguments)
WEECHAT_ERROR);
return -1;
}
if (index_command_search (arguments))
{
gui_printf (NULL, _("%s alias or command \"%s\" already exists!\n"),
WEECHAT_ERROR, arguments);
return -1;
}
pos2 = strchr (pos, ' ');
if (pos2)
pos2[0] = '\0';
if (alias_search (pos))
{
gui_printf (NULL, _("%s alias cannot run another alias!\n"),
WEECHAT_ERROR);
return -1;
}
if (!index_command_search (pos))
{
gui_printf (NULL, _("%s target command \"%s\" does not exist!\n"),
WEECHAT_ERROR, pos);
return -1;
}
if (pos2)
pos2[0] = ' ';
index_command_new (arguments);
if (!alias_new (arguments, pos))
return -1;

4
src/config.c
View File

@ -730,8 +730,8 @@ config_read ()
if (section == CONFIG_SECTION_ALIAS)
{
index_command_new (pos);
alias_new (line, pos);
if (alias_new (line, pos))
index_command_new (pos);
}
else
{

1
weechat/TODO
View File

@ -93,6 +93,7 @@ Future versions:
* Configuration:
- add key bindings to config file
- add missing options for config file
- wrong alias is not created and not saved when quitting WeeChat
* Plugins:
- add Perl plugin

50
weechat/src/command.c
View File

@ -324,8 +324,33 @@ alias_insert_sorted (t_weechat_alias *alias)
t_weechat_alias *
alias_new (char *alias_name, char *alias_command)
{
char *pos;
t_weechat_alias *new_alias;
if (index_command_search (alias_name))
{
gui_printf (NULL, _("%s alias or command \"%s\" already exists!\n"),
WEECHAT_ERROR, alias_name);
return NULL;
}
pos = strchr (alias_command, ' ');
if (pos)
pos[0] = '\0';
if (alias_search (alias_command))
{
gui_printf (NULL, _("%s alias cannot run another alias!\n"),
WEECHAT_ERROR);
return NULL;
}
if (!index_command_search (alias_command))
{
gui_printf (NULL, _("%s target command \"%s\" does not exist!\n"),
WEECHAT_ERROR, pos);
return NULL;
}
if (pos)
pos[0] = ' ';
if ((new_alias = ((t_weechat_alias *) malloc (sizeof (t_weechat_alias)))))
{
new_alias->alias_name = strdup (alias_name);
@ -710,7 +735,7 @@ user_command (t_irc_server *server, char *command)
int
weechat_cmd_alias (char *arguments)
{
char *pos, *pos2;
char *pos;
t_weechat_alias *ptr_alias;
if (arguments && arguments[0])
@ -729,29 +754,6 @@ weechat_cmd_alias (char *arguments)
WEECHAT_ERROR);
return -1;
}
if (index_command_search (arguments))
{
gui_printf (NULL, _("%s alias or command \"%s\" already exists!\n"),
WEECHAT_ERROR, arguments);
return -1;
}
pos2 = strchr (pos, ' ');
if (pos2)
pos2[0] = '\0';
if (alias_search (pos))
{
gui_printf (NULL, _("%s alias cannot run another alias!\n"),
WEECHAT_ERROR);
return -1;
}
if (!index_command_search (pos))
{
gui_printf (NULL, _("%s target command \"%s\" does not exist!\n"),
WEECHAT_ERROR, pos);
return -1;
}
if (pos2)
pos2[0] = ' ';
index_command_new (arguments);
if (!alias_new (arguments, pos))
return -1;

4
weechat/src/config.c
View File

@ -730,8 +730,8 @@ config_read ()
if (section == CONFIG_SECTION_ALIAS)
{
index_command_new (pos);
alias_new (line, pos);
if (alias_new (line, pos))
index_command_new (pos);
}
else
{