#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(), fflush() */
#include <stdlib.h> /* free(), atoi() */
#include <string.h> /* strlen(), strcmp() strncmp(), strdup() */
#include <unistd.h> /* access() */
* 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() */
#include "ai.h" /* ai() */
#include "cleanup.h" /* set_cleanup_flag(), unset_cleanup_flag() */
#include "field_of_view.h" /* build_fov_map() */
#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 */
/* 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 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_0arg(char * tok0, char * tok1);
+
+/* If "string" and "comparand" match in string, set "c_to_set" to value." */
+static uint8_t set_char_by_string_comparison(char * string, char * comparand,
+ char * c_to_set, char value);
+
+/* Parse player command "tok0" with one argument "tok1" to player action. */
+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
static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t)
{
uint8_t id;
- if (parse_val(tok0, tok1, s[CMD_CARRIES], '8', (char *) &id))
+ if (parse_val(tok0, tok1, s[S_CMD_CARRIES], '8', (char *) &id))
{
if (!err_line(id == t->id, "Thing cannot carry itself."))
{
static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t)
{
char axis = 0;
- if (!strcmp(tok0, s[CMD_POS_Y]))
+ if (!strcmp(tok0, s[S_CMD_POS_Y]))
{
axis = 'y';
}
- else if (!strcmp(tok0, s[CMD_POS_X]))
+ else if (!strcmp(tok0, s[S_CMD_POS_X]))
{
axis = 'x';
}
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 uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t)
{
uint8_t type;
- if (parse_val(tok0, tok1, s[CMD_TYPE], '8', (char *) &type))
+ if (parse_val(tok0, tok1, s[S_CMD_TYPE], '8', (char *) &type))
{
struct ThingType * tt = world.thing_types;
for (; NULL != tt && type != tt->id; tt = tt->next);
static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t)
{
uint8_t command;
- if (parse_val(tok0, tok1, s[CMD_COMMAND], '8', (char *) &command))
+ if (parse_val(tok0, tok1, s[S_CMD_COMMAND], '8', (char *) &command))
{
if (!command)
{
static uint8_t parse_do_fov(char * tok0, char * tok1)
{
- if (parse_val(tok0, tok1, s[CMD_DO_FOV], '8', (char *) &do_fov))
+ if (parse_val(tok0, tok1, s[S_CMD_DO_FOV], '8', (char *) &do_fov))
{
if (do_fov)
{
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[S_CMD_ARGUMENT], '8', (char *)&t->arg)
+ || parse_val(tok0,tok1,s[S_CMD_PROGRESS],'8',(char *)&t->progress)
+ || parse_val(tok0, tok1, s[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))
+ else if (parse_val(tok0, tok1, s[S_CMD_THING], '8', (char *) &id))
{
t = get_thing(world.things, id, 1);
if (!t)
{
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 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 ( parse_val(tok0, tok1, s[CMD_WAIT], '8', (char *) &player->arg)
- || parse_val(tok0, tok1, s[CMD_MOVE], '8', (char *) &player->arg)
- || parse_val(tok0, tok1, s[CMD_PICKUP], '8', (char *) &player->arg)
- || parse_val(tok0, tok1, s[CMD_DROP], '8', (char *) &player->arg)
- || parse_val(tok0, tok1, s[CMD_USE], '8', (char *) &player->arg))
+ 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 set_char_by_string_comparison(char * string, char * comparand,
+ char * c_to_set, char value)
+{
+ if (!strcmp(string, comparand))
+ {
+ * c_to_set = value;
+ 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_DROP], '8', (char *) &player->arg)
+ || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg))
+ {
+ player->command = get_thing_action_id_by_name(tok0);
+ turn_over();
+ }
+ else if (!strcmp(tok0, s[S_CMD_MOVE]))
+ {
+ char dir = '\0';
+ if (!( set_char_by_string_comparison(tok1, "east", &dir, 'd')
+ || set_char_by_string_comparison(tok1, "south-east", &dir, 'c')
+ || set_char_by_string_comparison(tok1, "south-west", &dir, 'x')
+ || set_char_by_string_comparison(tok1, "west", &dir, 's')
+ || set_char_by_string_comparison(tok1, "north-west", &dir, 'w')
+ || set_char_by_string_comparison(tok1, "north-east", &dir, 'e')))
+ {
+ return 0;
+ }
+ player->arg = dir;
+ player->command = get_thing_action_id_by_name(tok0);
+ turn_over();
+ }
+ else
+ {
+ return 0;
+ }
+ return 1;
+}
+
+
+
+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;
}
{
char * f_name = "server_test()";
char test[10 + 1 + 10 + 1 + 1];
- FILE * file = try_fopen(s[PATH_OUT], "r", f_name);
+ FILE * file = try_fopen(s[S_PATH_OUT], "r", f_name);
try_fgets(test, 10 + 10 + 1 + 1, file, f_name);
try_fclose(file, f_name);
if (strcmp(test, world.server_test))
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]);
- FILE * file_tmp = try_fopen(path_tmp, "w", f_name);
- if (!access(s[PATH_RECORD], F_OK))
+ 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[PATH_RECORD], "r", f_name);
+ FILE * file_read = try_fopen(s[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);
+ atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
}
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."))
+ if (NULL != tok0)
{
- return;
- }
- if ( parse_thing_manipulation(tok0, tok1)
- || parse_player_command(tok0, tok1)
- || 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))
-
- {
- remake_map();
- }
- else if (parse_val(tok0, tok1, s[CMD_MAKE_WORLD], 'U', (char *) &world.seed))
- {
- remake_world();
- }
- else
- {
- 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);
- }
}
projects / plomrogue / blobdiff