X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fcontrol.c;h=02e4fed2360bf8fda263b7b4f54ef0b1eda7733d;hb=6ac951c41a091ffc723840894ddf1e774739511d;hp=1961334c0015064f103b825f64aaf89651652000;hpb=539f4419afa0966d67b341dc6b30a6174bd3f844;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index 1961334..02e4fed 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -1,22 +1,25 @@
/* src/client/control.c */
#include "control.h"
-#include /* uint8_t, uint16_t */
+#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
+#include /* free() */
#include /* sprintf() */
#include /* strlen() */
+#include "../common/rexit.h" /* exit_err(), exit_trouble() */
+#include "../common/try_malloc.h" /* try_malloc() */
#include "interface_conf.h" /* reload_interface_conf(), save_interface_conf() */
#include "io.h" /* send() */
#include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(),
* mod_selected_keyb(), move_keyb_selection()
*/
-#include "map.h" /* for map_scroll(), map_center() */
+#include "map.h" /* map_scroll(), map_center(), toggle_autofocus() */
#include "wincontrol.h" /* shift_active_win(), resize_active_win(),
* toggle_win_size_type(), toggle_window(),
* cycle_active_win(), scroll_v_screen(),
* toggle_linebreak_type(), toggle_winconfig()
*/
#include "windows.h" /* get_win_by_id() */
-#include "world.h" /* for global world */
+#include "world.h" /* world */
@@ -54,7 +57,9 @@ static void nav_inventory(char dir)
return;
}
uint8_t n_elems = 0;
- uint8_t i;
+ uint32_t i;
+ char * err = "Inventory string is too large.";
+ exit_err(UINT32_MAX <= strlen(world.player_inventory), err);
for (i = 0; '\0' != world.player_inventory[i]; i++)
{
n_elems = n_elems + ('\n' == world.player_inventory[i]);
@@ -104,6 +109,7 @@ static uint8_t try_2args(struct Command * command, char * match,
static uint8_t try_client_commands(struct Command * command)
{
return ( try_0args(command, "map_c", map_center)
+ || try_0args(command, "to_autofocus", toggle_autofocus)
|| try_1args(command, "map_u", map_scroll, '8')
|| try_1args(command, "map_d", map_scroll, '2')
|| try_1args(command, "map_r", map_scroll, '6')
@@ -152,6 +158,7 @@ static uint8_t try_client_commands(struct Command * command)
static uint8_t try_server_commands(struct Command * command)
{
+ char * f_name = "try_server_commands()";
if (command->server_msg)
{
uint8_t arg = (uint8_t) command->arg;
@@ -161,9 +168,11 @@ static uint8_t try_server_commands(struct Command * command)
}
uint8_t command_size = strlen(command->server_msg);
uint8_t arg_size = 3;
- char msg[command_size + 1 + arg_size + 1];
- sprintf(msg, "%s %d", command->server_msg, arg);
+ char * msg = try_malloc(command_size + 1 + arg_size + 1, f_name);
+ int test = sprintf(msg, "%s %d", command->server_msg, arg);
+ exit_trouble(test < 0, f_name, "sprintf()");
send(msg);
+ free(msg);
return 1;
}
return 0;