Improved and defined more precisely textfile_sizes().

[plomrogue] / src / keybindings.c

diff --git a/src/keybindings.c b/src/keybindings.c
index c318ec18f49c1501c0e72640d7e01db01303350a..8b01958c940d5079f4d5157b6034a92f918a056e 100644 (file)
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -18,12 +18,13 @@ extern void init_keybindings(struct World * world)
 {
     FILE * file = fopen("config/keybindings", "r");
     uint16_t lines, linemax;
-    textfile_sizes(file, &linemax, &lines);
+    char * err = "textfile_sizes() in init_keybindings() returns error.";
+    exit_err(textfile_sizes(file, &linemax, &lines), world, err);
     struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
-    char * command = malloc(linemax);
+    char * command = malloc(linemax + 1);
     uint16_t commcount = 0;
     char * cmdptr;
-    while (fgets(command, linemax, file))
+    while (fgets(command, linemax + 1, file))
     {
         keybindings[commcount].key = atoi(command);
         cmdptr = strchr(command, ' ') + 1;