X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=bd054022973d94c5f1d4e2a653414f2ef369be9f;hb=d2707c20a501a2c99af20c7e20f7c1a374bfe6aa;hp=452c10b19a9f8c15d80fa1afe9676735483835a0;hpb=02faa5bf7e77b6bbf111819164f9a15e3792215a;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 452c10b..bd05402 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() */ @@ -28,7 +27,7 @@ #include "things.h" /* Thing, get_thing(), own_thing(), add_thing(), * get_thing_action_id_by_name(), get_player() */ -#include "world.h" /* global world */ +#include "world.h" /* world */ @@ -53,8 +52,19 @@ static uint8_t parse_do_fov(char * tok0, char * tok1); /* Parse/apply god command in "tok0"/"tok1" manipulating a thing's state. */ static uint8_t parse_thing_manipulation(char * tok0, char * tok1); -/* Parse player command in "tok0"/"tok1" to action in player thing. */ -static uint8_t parse_player_command(char * tok0, char * tok1); +/* Parse player command "tok0" with one arguments "tok1" to player action. */ +static uint8_t parse_player_command_0arg(char * tok0, char * tok1); + +/* Parse player command "tok0" with no argument to player action, comment on + * invalidity of non-zero "tok1" (but do not abort in that case). + */ +static uint8_t parse_player_command_1arg(char * tok0, char * tok1); + +/* Parse/apply commadn "tok0" with argument "tok1" and test the line for further + * tokens, commenting on their invalidity (but don't abort on findingthem). + */ +static uint8_t parse_command_1arg(char * tok0, char * tok1); + /* Compares first line of server out file to world.server_test, aborts if they * don't match, but not before unsetting the flags deleting files in the server @@ -222,12 +232,26 @@ static uint8_t parse_thing_manipulation(char * tok0, char * tok1) -static uint8_t parse_player_command(char * tok0, char * tok1) +static uint8_t parse_player_command_0arg(char * tok0, char * tok1) +{ + struct Thing * player = get_player(); + if (!strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP])) + { + player->command = get_thing_action_id_by_name(tok0); + player->arg = 0; + turn_over(); + err_line (NULL != tok1, "No arguments expected, ignoring arguments."); + return 1; + } + return 0; +} + + + +static uint8_t parse_player_command_1arg(char * tok0, char * tok1) { struct Thing * player = get_player(); - if ( parse_val(tok0, tok1, s[S_CMD_WAIT], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_MOVE], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_PICKUP], '8', (char *) &player->arg) + if ( parse_val(tok0, tok1, s[S_CMD_MOVE], '8', (char *) &player->arg) || parse_val(tok0, tok1, s[S_CMD_DROP], '8', (char *) &player->arg) || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg)) { @@ -243,6 +267,34 @@ static uint8_t parse_player_command(char * tok0, char * tok1) +static uint8_t parse_command_1arg(char * tok0, char * tok1) +{ + char * tok2 = token_from_line(NULL); + if ( parse_thing_manipulation(tok0, tok1) + || parse_player_command_1arg(tok0, tok1) + || parse_val(tok0, tok1, s[S_CMD_SEED_RAND], 'U', (char *) &world.seed) + || parse_val(tok0, tok1, s[S_CMD_TURN], 'u', (char *) &world.turn) + || parse_do_fov(tok0, tok1)); + else if (parse_val(tok0,tok1,s[S_CMD_SEED_MAP],'U',(char *)&world.seed_map)) + + { + remake_map(); + } + else if (parse_val(tok0, tok1, s[S_CMD_MAKE_WORLD],'U',(char *)&world.seed)) + { + remake_world(); + } + else + { + return 0; + } + char * err = "But one argument expected, ignoring further arguments."; + err_line (NULL != tok2, err); + return 1; +} + + + static void server_test() { char * f_name = "server_test()"; @@ -309,11 +361,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 +377,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); } @@ -339,39 +387,24 @@ extern void obey_msg(char * msg, uint8_t do_record) set_err_line_options("Trouble with message: ", msg, 0, 0); char * msg_copy = strdup(msg); char * tok0 = token_from_line(msg_copy); - char * tok1 = token_from_line(NULL); - char * tok2 = token_from_line(NULL); - if (err_line(!(tok0 && tok1) || tok2, "Bad number of tokens.")) - { - return; - } - if ( parse_thing_manipulation(tok0, tok1) - || parse_player_command(tok0, tok1) - || parse_val(tok0, tok1, s[S_CMD_SEED_RAND], 'U', (char *) &world.seed) - || parse_val(tok0, tok1, s[S_CMD_TURN], 'u', (char *) &world.turn) - || parse_do_fov(tok0, tok1)); - else if (parse_val(tok0,tok1,s[S_CMD_SEED_MAP],'U',(char *)&world.seed_map)) - - { - remake_map(); - } - else if (parse_val(tok0, tok1, s[S_CMD_MAKE_WORLD],'U',(char *)&world.seed)) - { - remake_world(); - } - else + if (NULL != tok0) { - err_line(1, "Unknown command."); - free(msg_copy); - return; + char * tok1 = token_from_line(NULL); + if ( parse_player_command_0arg(tok0, tok1) + || (tok1 && parse_command_1arg(tok0, tok1))) + { + world.do_update = 1; + if (do_record) + { + save_world(); + record_msg(msg); + } + free(msg_copy); + return; + } } - world.last_update_turn = 0; + err_line(1, "Unknown command or bad number of tokens."); free(msg_copy); - if (do_record) - { - save_world(); - record_msg(msg); - } }