aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Refactored cmd_join to use parse_options

Browse Source
This commit is contained in:
James Booth 2014-04-14 23:36:00 +01:00
parent 428d9eb936
commit 3e69d6b71e
2 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/command/commands.c
View File

@ -1551,7 +1551,6 @@ cmd_join(gchar **args, struct cmd_help_t help)
return TRUE;
}
int num_args = g_strv_length(args);
char *room = NULL;
char *nick = NULL;
char *passwd = NULL;
@ -1572,40 +1571,23 @@ cmd_join(gchar **args, struct cmd_help_t help)
}
// Additional args supplied
if (num_args > 1) {
char *opt1 = args[1];
char *opt1val = args[2];
char *opt2 = args[3];
char *opt2val = args[4];
if (opt1 != NULL) {
if (opt1val == NULL) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
if (strcmp(opt1, "nick") == 0) {
nick = opt1val;
} else if (strcmp(opt1, "password") == 0) {
passwd = opt1val;
} else {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
if (opt2 != NULL) {
if (strcmp(opt2, "nick") == 0) {
nick = opt2val;
} else if (strcmp(opt2, "password") == 0) {
passwd = opt2val;
} else {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
}
}
GList *opt_keys = NULL;
opt_keys = g_list_append(opt_keys, "nick");
opt_keys = g_list_append(opt_keys, "password");
gboolean parsed;
GHashTable *options = parse_options(args, 1, opt_keys, &parsed);
if (!parsed) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
nick = g_hash_table_lookup(options, "nick");
passwd = g_hash_table_lookup(options, "password");
options_destroy(options);
// In the case that a nick wasn't provided by the optional args...
if (nick == NULL) {
nick = account->muc_nick;

4
src/tools/parser.c
View File

@ -390,13 +390,13 @@ parse_options(gchar **args, int start, GList *keys, gboolean *res)
GList *found_keys = NULL;
for (curr = start; curr < g_strv_length(args); curr+= 2) {
// check if option valid
if (g_list_find(keys, args[curr]) == NULL) {
if (g_list_find_custom(keys, args[curr], (GCompareFunc)g_strcmp0) == NULL) {
*res = FALSE;
return options;
}
// check if duplicate
if (g_list_find(found_keys, args[curr]) != NULL) {
if (g_list_find_custom(found_keys, args[curr], (GCompareFunc)g_strcmp0) != NULL) {
*res = FALSE;
return options;
}