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

Refactored cmd_connect to use parse_options

Browse Source
This commit is contained in:
James Booth
2014-04-14 23:15:39 +01:00
parent 2419737006
commit 428d9eb936
1 changed files with 23 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/command/commands.c
View File

@@ -68,85 +68,36 @@ cmd_connect(gchar **args, struct cmd_help_t help)
cons_show("You are either connected already, or a login is in process."); cons_show("You are either connected already, or a login is in process.");
result = TRUE; result = TRUE;
} else { } else {
char *user = args[0]; GList *opt_keys = NULL;
char *opt1 = args[1]; opt_keys = g_list_append(opt_keys, "server");
char *opt1val = args[2]; opt_keys = g_list_append(opt_keys, "port");
char *opt2 = args[3]; gboolean parsed;
char *opt2val = args[4];
char *lower = g_utf8_strdown(user, -1); GHashTable *options = parse_options(args, 1, opt_keys, &parsed);
char *jid; if (!parsed) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
char *altdomain = g_hash_table_lookup(options, "server");
// parse options
char *altdomain = NULL;
int port = 0; int port = 0;
gboolean server_set = FALSE; if (g_hash_table_contains(options, "port")) {
gboolean port_set = FALSE; char *port_str = g_hash_table_lookup(options, "port");
if (opt1 != NULL) { if (_strtoi(port_str, &port, 1, 65535) != 0) {
if (opt1val == NULL) { port = 0;
cons_show("Usage: %s", help.usage);
cons_show(""); cons_show("");
return TRUE; return TRUE;
} }
if (strcmp(opt1, "server") == 0) {
altdomain = opt1val;
server_set = TRUE;
} else if (strcmp(opt1, "port") == 0) {
if (_strtoi(opt1val, &port, 1, 65535) != 0) {
port = 0;
cons_show("");
return TRUE;
} else {
port_set = TRUE;
}
} else {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
if (opt2 != NULL) {
if (server_set && strcmp("server", opt2) == 0) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
if (port_set && strcmp("port", opt2) == 0) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
if (opt2val == NULL) {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
if (strcmp(opt2, "server") == 0) {
if (server_set) {
cons_show("Usage: %s", help.usage);
return TRUE;
}
altdomain = opt2val;
server_set = TRUE;
} else if (strcmp(opt2, "port") == 0) {
if (port_set) {
cons_show("Usage: %s", help.usage);
return TRUE;
}
if (_strtoi(opt2val, &port, 1, 65535) != 0) {
port = 0;
cons_show("");
return TRUE;
} else {
port_set = TRUE;
}
} else {
cons_show("Usage: %s", help.usage);
cons_show("");
return TRUE;
}
}
} }
options_destroy(options);
char *user = args[0];
char *lower = g_utf8_strdown(user, -1);
char *jid;
ProfAccount *account = accounts_get_account(lower); ProfAccount *account = accounts_get_account(lower);
if (account != NULL) { if (account != NULL) {
jid = account_create_full_jid(account); jid = account_create_full_jid(account);