devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Don't allow /alias to overwrite standard command

Browse Source
This commit is contained in:
James Booth
2014-01-25 01:39:12 +00:00
parent 17f40b76ee
commit 4bd06a5d87
7 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/command.c
View File

@@ -1120,6 +1120,16 @@ cmd_uninit(void)
autocomplete_free(aliases_ac);
}
gboolean
cmd_exists(char *cmd)
{
if (commands_ac == NULL) {
return FALSE;
} else {
return autocomplete_contains(commands_ac, cmd);
}
}
void
cmd_autocomplete_add(char *value)
{

2
src/command/command.h
View File

@@ -41,6 +41,8 @@ gboolean cmd_execute(const char * const command, const char * const inp);
gboolean cmd_execute_alias(const char * const inp, gboolean *ran);
gboolean cmd_execute_default(const char * const inp);
gboolean cmd_exists(char *cmd);
GSList * cmd_get_basic_help(void);
GSList * cmd_get_settings_help(void);
GSList * cmd_get_presence_help(void);

23
src/command/commands.c
View File

@@ -1830,21 +1830,24 @@ cmd_alias(gchar **args, struct cmd_help_t help)
cons_show("Usage: %s", help.usage);
return TRUE;
} else {
GString *ac_value = g_string_new("/");
g_string_append(ac_value, alias);
char *value = args[2];
if (value == NULL) {
cons_show("Usage: %s", help.usage);
g_string_free(ac_value, TRUE);
return TRUE;
} else if (cmd_exists(ac_value->str)) {
cons_show("Command or alias '%s' already exists.");
g_string_free(ac_value, TRUE);
return TRUE;
} else {
if (prefs_add_alias(alias, value) == TRUE) {
GString *ac_value = g_string_new("/");
g_string_append(ac_value, alias);
cmd_autocomplete_add(ac_value->str);
cmd_alias_add(alias);
g_string_free(ac_value, TRUE);
cons_show("Command alias added /%s -> %s", alias, value);
} else {
cons_show("Command alias /%s already exists.", alias);
}
prefs_add_alias(alias, value);
cmd_autocomplete_add(ac_value->str);
cmd_alias_add(alias);
cons_show("Command alias added /%s -> %s", alias, value);
g_string_free(ac_value, TRUE);
return TRUE;
}
}