X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=8e1914b72da4b0c75642465463165c3c390c8b4b;hb=036e0f646d4b55cc0162a8fad7f1a9559db50c50;hp=452c10b19a9f8c15d80fa1afe9676735483835a0;hpb=02faa5bf7e77b6bbf111819164f9a15e3792215a;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 452c10b..8e1914b 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -4,7 +4,7 @@
#include "run.h"
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t */
-#include /* FILE, printf(), sprintf(), fflush() */
+#include /* FILE, printf(), fflush() */
#include /* free(), atoi() */
#include /* strlen(), strcmp() strncmp(), strdup() */
#include /* access() */
@@ -12,8 +12,7 @@
* err_line()
*/
#include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
- * try_fgets(), try_fclose_unlink_rename(),
- * textfile_width(), try_fputc()
+ * try_fgets(), textfile_width(), try_fputc()
*/
#include "../common/rexit.h" /* exit_trouble(), exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
@@ -309,11 +308,8 @@ static void turn_over()
static void record_msg(char * msg)
{
char * f_name = "record_msg()";
- uint16_t size = strlen(s[S_PATH_RECORD]) + strlen(s[S_PATH_SUFFIX_TMP]) + 1;
- char * path_tmp = try_malloc(size, f_name);
- int test = sprintf(path_tmp, "%s%s", s[S_PATH_RECORD],s[S_PATH_SUFFIX_TMP]);
- exit_trouble(test < 0, f_name, s[S_FCN_SPRINTF]);
- FILE * file_tmp = try_fopen(path_tmp, "w", f_name);
+ char * path_tmp;
+ FILE * file_tmp = atomic_write_start(s[S_PATH_RECORD], &path_tmp);
if (!access(s[S_PATH_RECORD], F_OK))
{
FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", f_name);
@@ -328,8 +324,7 @@ static void record_msg(char * msg)
}
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[S_PATH_RECORD], f_name);
- free(path_tmp);
+ atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
}
@@ -365,7 +360,7 @@ extern void obey_msg(char * msg, uint8_t do_record)
free(msg_copy);
return;
}
- world.last_update_turn = 0;
+ world.do_update = 1;
free(msg_copy);
if (do_record)
{