aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Removed console dependency from strtoi

Browse Source
This commit is contained in:
James Booth 2015-03-16 01:03:20 +00:00
parent 9bf5a68329
commit 23ef3498b5
1 changed files with 126 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
src/command/commands.c
View File

@ -72,7 +72,7 @@ static void _update_presence(const resource_presence_t presence,
const char * const show, gchar **args); const char * const show, gchar **args);
static gboolean _cmd_set_boolean_preference(gchar *arg, struct cmd_help_t help, static gboolean _cmd_set_boolean_preference(gchar *arg, struct cmd_help_t help,
const char * const display, preference_t pref); const char * const display, preference_t pref);
static int _strtoi(char *str, int *saveptr, int min, int max); static gboolean _strtoi(char *str, int *saveptr, int min, int max, char **err_msg);
static void _cmd_show_filtered_help(char *heading, gchar *cmd_filter[], int filter_size); static void _cmd_show_filtered_help(char *heading, gchar *cmd_filter[], int filter_size);
static gint _compare_commands(Command *a, Command *b); static gint _compare_commands(Command *a, Command *b);
static void _who_room(gchar **args, struct cmd_help_t help); static void _who_room(gchar **args, struct cmd_help_t help);
@ -212,9 +212,13 @@ cmd_connect(gchar **args, struct cmd_help_t help)
int port = 0; int port = 0;
if (g_hash_table_contains(options, "port")) { if (g_hash_table_contains(options, "port")) {
char *port_str = g_hash_table_lookup(options, "port"); char *port_str = g_hash_table_lookup(options, "port");
if (_strtoi(port_str, &port, 1, 65535) != 0) { char *err_msg = NULL;
port = 0; gboolean res = _strtoi(port_str, &port, 1, 65535, &err_msg);
if (!res) {
cons_show(err_msg);
cons_show(""); cons_show("");
free(err_msg);
port = 0;
return TRUE; return TRUE;
} }
} }
@ -464,8 +468,12 @@ cmd_account(gchar **args, struct cmd_help_t help)
cons_show(""); cons_show("");
} else if (strcmp(property, "port") == 0) { } else if (strcmp(property, "port") == 0) {
int port; int port;
if (_strtoi(value, &port, 1, 65535) != 0) { char *err_msg = NULL;
gboolean res = _strtoi(value, &port, 1, 65535, &err_msg);
if (!res) {
cons_show(err_msg);
cons_show(""); cons_show("");
free(err_msg);
return TRUE; return TRUE;
} else { } else {
accounts_set_port(account_name, port); accounts_set_port(account_name, port);
@ -519,42 +527,46 @@ cmd_account(gchar **args, struct cmd_help_t help)
} }
cons_show(""); cons_show("");
} else if (valid_resource_presence_string(property)) { } else if (valid_resource_presence_string(property)) {
int intval; int intval;
char *err_msg = NULL;
if (_strtoi(value, &intval, -128, 127) == 0) { gboolean res = _strtoi(value, &intval, -128, 127, &err_msg);
resource_presence_t presence_type = resource_presence_from_string(property); if (res) {
switch (presence_type) resource_presence_t presence_type = resource_presence_from_string(property);
{ switch (presence_type)
case (RESOURCE_ONLINE): {
accounts_set_priority_online(account_name, intval); case (RESOURCE_ONLINE):
break; accounts_set_priority_online(account_name, intval);
case (RESOURCE_CHAT): break;
accounts_set_priority_chat(account_name, intval); case (RESOURCE_CHAT):
break; accounts_set_priority_chat(account_name, intval);
case (RESOURCE_AWAY): break;
accounts_set_priority_away(account_name, intval); case (RESOURCE_AWAY):
break; accounts_set_priority_away(account_name, intval);
case (RESOURCE_XA): break;
accounts_set_priority_xa(account_name, intval); case (RESOURCE_XA):
break; accounts_set_priority_xa(account_name, intval);
case (RESOURCE_DND): break;
accounts_set_priority_dnd(account_name, intval); case (RESOURCE_DND):
break; accounts_set_priority_dnd(account_name, intval);
} break;
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status == JABBER_CONNECTED) {
char *connected_account = jabber_get_account_name();
resource_presence_t last_presence = accounts_get_last_presence(connected_account);
if (presence_type == last_presence) {
char *message = jabber_get_presence_message();
presence_update(last_presence, message, 0);
}
}
cons_show("Updated %s priority for account %s: %s", property, account_name, value);
cons_show("");
} }
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status == JABBER_CONNECTED) {
char *connected_account = jabber_get_account_name();
resource_presence_t last_presence = accounts_get_last_presence(connected_account);
if (presence_type == last_presence) {
char *message = jabber_get_presence_message();
presence_update(last_presence, message, 0);
}
}
cons_show("Updated %s priority for account %s: %s", property, account_name, value);
cons_show("");
} else {
cons_show(err_msg);
free(err_msg);
}
} else { } else {
cons_show("Invalid property: %s", property); cons_show("Invalid property: %s", property);
cons_show(""); cons_show("");
@ -1557,11 +1569,14 @@ cmd_roster(gchar **args, struct cmd_help_t help)
// set roster size // set roster size
} else if (g_strcmp0(args[0], "size") == 0) { } else if (g_strcmp0(args[0], "size") == 0) {
int intval = 0;
if (!args[1]) { if (!args[1]) {
cons_show("Usage: %s", help.usage); cons_show("Usage: %s", help.usage);
return TRUE; return TRUE;
} else if (_strtoi(args[1], &intval, 1, 99) == 0) { }
int intval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(args[1], &intval, 1, 99, &err_msg);
if (res) {
prefs_set_roster_size(intval); prefs_set_roster_size(intval);
cons_show("Roster screen size set to: %d%%", intval); cons_show("Roster screen size set to: %d%%", intval);
if (prefs_get_boolean(PREF_ROSTER)) { if (prefs_get_boolean(PREF_ROSTER)) {
@ -1569,6 +1584,8 @@ cmd_roster(gchar **args, struct cmd_help_t help)
} }
return TRUE; return TRUE;
} else { } else {
cons_show(err_msg);
free(err_msg);
return TRUE; return TRUE;
} }
@ -2836,15 +2853,23 @@ cmd_occupants(gchar **args, struct cmd_help_t help)
} }
if (g_strcmp0(args[0], "size") == 0) { if (g_strcmp0(args[0], "size") == 0) {
int intval = 0;
if (!args[1]) { if (!args[1]) {
cons_show("Usage: %s", help.usage); cons_show("Usage: %s", help.usage);
return TRUE; return TRUE;
} else if (_strtoi(args[1], &intval, 1, 99) == 0) { } else {
prefs_set_occupants_size(intval); int intval = 0;
cons_show("Occupants screen size set to: %d%%", intval); char *err_msg = NULL;
wins_resize_all(); gboolean res = _strtoi(args[1], &intval, 1, 99, &err_msg);
return TRUE; if (res) {
prefs_set_occupants_size(intval);
cons_show("Occupants screen size set to: %d%%", intval);
wins_resize_all();
return TRUE;
} else {
cons_show(err_msg);
free(err_msg);
return TRUE;
}
} }
} }
@ -3596,7 +3621,6 @@ cmd_inpblock(gchar **args, struct cmd_help_t help)
{ {
char *subcmd = args[0]; char *subcmd = args[0];
char *value = args[1]; char *value = args[1];
int intval;
if (g_strcmp0(subcmd, "timeout") == 0) { if (g_strcmp0(subcmd, "timeout") == 0) {
if (value == NULL) { if (value == NULL) {
@ -3604,10 +3628,16 @@ cmd_inpblock(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} }
if (_strtoi(value, &intval, 1, 1000) == 0) { int intval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(value, &intval, 1, 1000, &err_msg);
if (res) {
cons_show("Input blocking set to %d milliseconds.", intval); cons_show("Input blocking set to %d milliseconds.", intval);
prefs_set_inpblock(intval); prefs_set_inpblock(intval);
ui_input_nonblocking(FALSE); ui_input_nonblocking(FALSE);
} else {
cons_show(err_msg);
free(err_msg);
} }
return TRUE; return TRUE;
@ -3637,16 +3667,22 @@ cmd_log(gchar **args, struct cmd_help_t help)
{ {
char *subcmd = args[0]; char *subcmd = args[0];
char *value = args[1]; char *value = args[1];
int intval;
if (strcmp(subcmd, "maxsize") == 0) { if (strcmp(subcmd, "maxsize") == 0) {
if (value == NULL) { if (value == NULL) {
cons_show("Usage: %s", help.usage); cons_show("Usage: %s", help.usage);
return TRUE; return TRUE;
} }
if (_strtoi(value, &intval, PREFS_MIN_LOG_SIZE, INT_MAX) == 0) {
int intval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(value, &intval, PREFS_MIN_LOG_SIZE, INT_MAX, &err_msg);
if (res) {
prefs_set_max_log_size(intval); prefs_set_max_log_size(intval);
cons_show("Log maxinum size set to %d bytes", intval); cons_show("Log maxinum size set to %d bytes", intval);
} else {
cons_show(err_msg);
free(err_msg);
} }
return TRUE; return TRUE;
} }
@ -3686,9 +3722,11 @@ gboolean
cmd_reconnect(gchar **args, struct cmd_help_t help) cmd_reconnect(gchar **args, struct cmd_help_t help)
{ {
char *value = args[0]; char *value = args[0];
int intval;
if (_strtoi(value, &intval, 0, INT_MAX) == 0) { int intval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(value, &intval, 0, INT_MAX, &err_msg);
if (res) {
prefs_set_reconnect(intval); prefs_set_reconnect(intval);
if (intval == 0) { if (intval == 0) {
cons_show("Reconnect disabled.", intval); cons_show("Reconnect disabled.", intval);
@ -3696,7 +3734,9 @@ cmd_reconnect(gchar **args, struct cmd_help_t help)
cons_show("Reconnect interval set to %d seconds.", intval); cons_show("Reconnect interval set to %d seconds.", intval);
} }
} else { } else {
cons_show(err_msg);
cons_show("Usage: %s", help.usage); cons_show("Usage: %s", help.usage);
free(err_msg);
} }
return TRUE; return TRUE;
@ -3706,9 +3746,11 @@ gboolean
cmd_autoping(gchar **args, struct cmd_help_t help) cmd_autoping(gchar **args, struct cmd_help_t help)
{ {
char *value = args[0]; char *value = args[0];
int intval;
if (_strtoi(value, &intval, 0, INT_MAX) == 0) { int intval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(value, &intval, 0, INT_MAX, &err_msg);
if (res) {
prefs_set_autoping(intval); prefs_set_autoping(intval);
iq_set_autoping(intval); iq_set_autoping(intval);
if (intval == 0) { if (intval == 0) {
@ -3717,7 +3759,9 @@ cmd_autoping(gchar **args, struct cmd_help_t help)
cons_show("Autoping interval set to %d seconds.", intval); cons_show("Autoping interval set to %d seconds.", intval);
} }
} else { } else {
cons_show(err_msg);
cons_show("Usage: %s", help.usage); cons_show("Usage: %s", help.usage);
free(err_msg);
} }
return TRUE; return TRUE;
@ -3748,7 +3792,6 @@ cmd_autoaway(gchar **args, struct cmd_help_t help)
{ {
char *setting = args[0]; char *setting = args[0];
char *value = args[1]; char *value = args[1];
int minutesval;
if ((strcmp(setting, "mode") != 0) && (strcmp(setting, "time") != 0) && if ((strcmp(setting, "mode") != 0) && (strcmp(setting, "time") != 0) &&
(strcmp(setting, "message") != 0) && (strcmp(setting, "check") != 0)) { (strcmp(setting, "message") != 0) && (strcmp(setting, "check") != 0)) {
@ -3769,9 +3812,15 @@ cmd_autoaway(gchar **args, struct cmd_help_t help)
} }
if (strcmp(setting, "time") == 0) { if (strcmp(setting, "time") == 0) {
if (_strtoi(value, &minutesval, 1, INT_MAX) == 0) { int minutesval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(value, &minutesval, 1, INT_MAX, &err_msg);
if (res) {
prefs_set_autoaway_time(minutesval); prefs_set_autoaway_time(minutesval);
cons_show("Auto away time set to: %d minutes.", minutesval); cons_show("Auto away time set to: %d minutes.", minutesval);
} else {
cons_show(err_msg);
free(err_msg);
} }
return TRUE; return TRUE;
@ -3808,13 +3857,18 @@ cmd_priority(gchar **args, struct cmd_help_t help)
} }
char *value = args[0]; char *value = args[0];
int intval;
if (_strtoi(value, &intval, -128, 127) == 0) { int intval = 0;
char *err_msg = NULL;
gboolean res = _strtoi(value, &intval, -128, 127, &err_msg);
if (res) {
accounts_set_priority_all(jabber_get_account_name(), intval); accounts_set_priority_all(jabber_get_account_name(), intval);
resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name()); resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name());
presence_update(last_presence, jabber_get_presence_message(), 0); presence_update(last_presence, jabber_get_presence_message(), 0);
cons_show("Priority set to %d.", intval); cons_show("Priority set to %d.", intval);
} else {
cons_show(err_msg);
free(err_msg);
} }
return TRUE; return TRUE;
@ -4358,8 +4412,8 @@ _cmd_set_boolean_preference(gchar *arg, struct cmd_help_t help,
return TRUE; return TRUE;
} }
static int static gboolean
_strtoi(char *str, int *saveptr, int min, int max) _strtoi(char *str, int *saveptr, int min, int max, char **err_msg)
{ {
char *ptr; char *ptr;
int val; int val;
@ -4367,16 +4421,22 @@ _strtoi(char *str, int *saveptr, int min, int max)
errno = 0; errno = 0;
val = (int)strtol(str, &ptr, 0); val = (int)strtol(str, &ptr, 0);
if (errno != 0 || *str == '\0' || *ptr != '\0') { if (errno != 0 || *str == '\0' || *ptr != '\0') {
cons_show("Could not convert \"%s\" to a number.", str); GString *err_str = g_string_new("");
return -1; g_string_printf(err_str, "Could not convert \"%s\" to a number.", str);
*err_msg = err_str->str;
g_string_free(err_str, FALSE);
return FALSE;
} else if (val < min || val > max) { } else if (val < min || val > max) {
cons_show("Value %s out of range. Must be in %d..%d.", str, min, max); GString *err_str = g_string_new("");
return -1; g_string_printf(err_str, "Value %s out of range. Must be in %d..%d.", str, min, max);
*err_msg = err_str->str;
g_string_free(err_str, FALSE);
return FALSE;
} }
*saveptr = val; *saveptr = val;
return 0; return TRUE;
} }
static void static void