#include "run.h"
#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
-#include <stdio.h> /* FILE, sprintf(), fflush() */
+#include <stdio.h> /* FILE, printf(), sprintf(), fflush() */
#include <stdlib.h> /* free(), atoi() */
#include <string.h> /* strlen(), strcmp() strncmp(), strdup() */
#include <unistd.h> /* access() */
* textfile_width(), try_fputc()
*/
#include "../common/rexit.h" /* exit_trouble(), exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
#include "ai.h" /* ai() */
#include "cleanup.h" /* set_cleanup_flag(), unset_cleanup_flag() */
#include "field_of_view.h" /* build_fov_map() */
t->pos.x = length;
}
free(t->fov_map);
- t->fov_map = do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
+ t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
}
return 1;
}
static struct Thing * t = NULL;
if (t && ( parse_thing_type(tok0, tok1, t)
|| parse_thing_command(tok0, tok1, t)
- || parse_val(tok0, tok1, s[CMD_ARGUMENT], '8', (char *) &t->arg)
- || parse_val(tok0, tok1, s[CMD_PROGRESS], '8', (char *) &t->progress)
-
- || parse_val(tok0, tok1, s[CMD_LIFEPOINTS],'8',(char *) &t->lifepoints)
+ || parse_val(tok0, tok1, s[CMD_ARGUMENT], '8', (char *)&t->arg)
+ || parse_val(tok0, tok1, s[CMD_PROGRESS],'8',(char *)&t->progress)
+ || parse_val(tok0, tok1, s[CMD_LIFEPOINTS],'8',
+ (char *) &t->lifepoints)
|| parse_position(tok0, tok1, t)
|| parse_carry(tok0, tok1, t)));
else if (parse_val(tok0, tok1, s[CMD_THING], '8', (char *) &id))
{
t = add_thing(id, 0, 0);
set_cleanup_flag(CLEANUP_THINGS);
- t->fov_map = do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
+ t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
}
}
else
static void record_msg(char * msg)
{
char * f_name = "record_msg()";
- char path_tmp[strlen(s[PATH_RECORD]) + strlen(s[PATH_SUFFIX_TMP]) + 1];
- sprintf(path_tmp, "%s%s", s[PATH_RECORD], s[PATH_SUFFIX_TMP]);
+ uint16_t size = strlen(s[PATH_RECORD]) + strlen(s[PATH_SUFFIX_TMP]) + 1;
+ char * path_tmp = try_malloc(size, f_name);
+ int test = sprintf(path_tmp, "%s%s", s[PATH_RECORD], s[PATH_SUFFIX_TMP]);
+ exit_trouble(test < 0, f_name, "sprintf()");
FILE * file_tmp = try_fopen(path_tmp, "w", f_name);
if (!access(s[PATH_RECORD], F_OK))
{
FILE * file_read = try_fopen(s[PATH_RECORD], "r", f_name);
uint32_t linemax = textfile_width(file_read);
- char line[linemax + 1];
+ char * line = try_malloc(linemax + 1, f_name);
while (try_fgets(line, linemax + 1, file_read, f_name))
{
try_fwrite(line, strlen(line), 1, file_tmp, f_name);
}
+ free(line);
try_fclose(file_read, f_name);
}
try_fwrite(msg, strlen(msg), 1, file_tmp, f_name);
try_fputc('\n', file_tmp, f_name);
try_fclose_unlink_rename(file_tmp, path_tmp, s[PATH_RECORD], f_name);
+ free(path_tmp);
}
|| parse_val(tok0, tok1, s[CMD_SEED_RAND], 'U', (char *) &world.seed)
|| parse_val(tok0, tok1, s[CMD_TURN], 'u', (char *) &world.turn)
|| parse_do_fov(tok0, tok1));
- else if (parse_val(tok0, tok1, s[CMD_SEED_MAP], 'U', (char *) &world.seed_map))
+ else if (parse_val(tok0, tok1, s[CMD_SEED_MAP],'U',(char *)&world.seed_map))
{
remake_map();
}
- else if (parse_val(tok0, tok1, s[CMD_MAKE_WORLD], 'U', (char *) &world.seed))
+ else if (parse_val(tok0, tok1, s[CMD_MAKE_WORLD],'U', (char *) &world.seed))
{
remake_world();
}