#include <stdio.h> /* FILE, printf(), fflush() */
#include <stdlib.h> /* free() */
#include <string.h> /* strlen(), strcmp(), strncmp(), strdup() */
+#include <time.h> /* time_t, time() */
#include <unistd.h> /* access() */
#include "../common/parse_file.h" /* set_err_line_options(), token_from_line(),
* err_line(), err_line_inc(), parse_val()
*/
#include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
- * try_fgets(), textfile_width(), try_fputc()
+ * try_fgets(), textfile_width(), try_fputc(),
+ * atomic_write_finish(), build_temp_path()
*/
#include "../common/rexit.h" /* exit_trouble(), exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "ai.h" /* ai() */
#include "cleanup.h" /* unset_cleanup_flag() */
-#include "god_commands.h" /* parse_god_command_1arg() */
+#include "god_commands.h" /* parse_god_command_1arg(),parse_god_command_2arg()*/
#include "hardcoded_strings.h" /* s */
#include "io.h" /* io_round(), save_world() */
#include "things.h" /* Thing, get_thing_action_id_by_name(), get_player() */
/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */
static uint8_t player_commands_allowed();
-/* 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);
+/* Parse player command "tok0" with no argument to player action. */
+static uint8_t parse_player_command_0arg(char * tok0);
/* Parse player command "tok0" with one argument "tok1" to player action. */
static uint8_t parse_player_command_1arg(char * tok0, char * tok1);
-/* Parse/apply command "tok0" with argument "tok1" and test the line for further
- * tokens, commenting on their invalidity (but don't abort on finding them).
- */
-static uint8_t parse_command_1arg(char * tok0, char * tok1);
-
+/* Parse/apply command "tok0" (read further tokens as necessary). */
+static uint8_t parse_command(char * tok0);
/* 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 set_char_by_string_comparison(char * string, char * comparand,
char * c_to_set, char value)
{
-static uint8_t parse_player_command_0arg(char * tok0, char * tok1)
+static uint8_t parse_player_command_0arg(char * tok0)
{
struct Thing * player = get_player();
- if (!strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP]))
+ if ( !strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP])
+ || !strcmp(tok0, s[S_CMD_AI]))
{
if (player_commands_allowed())
{
- player->command = get_thing_action_id_by_name(tok0);
- player->arg = 0;
+ if (!strcmp(tok0, s[S_CMD_AI]))
+ {
+ ai(player);
+ }
+ else
+ {
+ player->command = get_thing_action_id_by_name(tok0);
+ player->arg = 0;
+ }
turn_over();
- err_line (NULL != tok1, "No arguments expected, ignoring them.");
}
return 1;
}
-static uint8_t parse_command_1arg(char * tok0, char * tok1)
+static uint8_t parse_command(char * tok0)
{
- char * tok2 = token_from_line(NULL);
- if ( parse_player_command_1arg(tok0, tok1)
- || parse_god_command_1arg(tok0, tok1));
+ if (parse_player_command_0arg(tok0))
+ {
+ return 1;
+ }
else
{
- return 0;
+ char * tok1 = token_from_line(NULL);
+ if (tok1 && ( parse_player_command_1arg(tok0, tok1)
+ || parse_god_command_1arg(tok0, tok1)))
+ {
+ return 1;
+ }
+ else
+ {
+ char * tok2 = token_from_line(NULL);
+ if (tok2 && parse_god_command_2arg(tok0, tok1, tok2))
+ {
+ return 1;
+ }
+ }
}
- char * err = "But one argument expected, ignoring further arguments.";
- err_line (NULL != tok2, err);
- return 1;
+ return 0;
}
ai(thing);
}
thing->progress++;
-
struct ThingAction * ta = get_thing_action(thing->command);
if (thing->progress == ta->effort)
{
-static void record_msg(char * msg)
+extern void record(char * msg, uint8_t force)
{
- char * path_tmp;
- FILE * file_tmp = atomic_write_start(s[S_PATH_RECORD], &path_tmp);
- if (!access(s[S_PATH_RECORD], F_OK))
+ static FILE * file_tmp = NULL;
+ static time_t save_wait = 0;
+ static char * path_tmp;
+ if (!file_tmp)
{
- FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", __func__);
- uint32_t linemax = textfile_width(file_read);
- char * line = try_malloc(linemax + 1, __func__);
- while (try_fgets(line, linemax + 1, file_read, __func__))
+ path_tmp = build_temp_path(s[S_PATH_RECORD]);
+ file_tmp = try_fopen(path_tmp, "w", __func__);
+ if (!access(s[S_PATH_RECORD], F_OK))
{
- try_fwrite(line, strlen(line), 1, file_tmp, __func__);
+ FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", __func__);
+ uint32_t linemax = textfile_width(file_read);
+ char * line = try_malloc(linemax + 1, __func__);
+ while (try_fgets(line, linemax + 1, file_read, __func__))
+ {
+ try_fwrite(line, strlen(line), 1, file_tmp, __func__);
+ }
+ free(line);
+ try_fclose(file_read, __func__);
}
- free(line);
- try_fclose(file_read, __func__);
}
- try_fwrite(msg, strlen(msg), 1, file_tmp, __func__);
- try_fputc('\n', file_tmp, __func__);
- atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
+ if (msg)
+ {
+ try_fwrite(msg, strlen(msg), 1, file_tmp, __func__);
+ try_fputc('\n', file_tmp, __func__);
+ }
+ if (force || time(NULL) > save_wait + 15)
+ {
+ save_wait = time(NULL);
+ save_world();
+ atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
+ file_tmp = NULL;
+ }
}
}
set_err_line_options("Trouble with message: ", msg, 0);
char * msg_copy = strdup(msg);
- if (msg[0] == 'm')
- {
- int a = 5;
- a = a;
- }
char * tok0 = token_from_line(msg_copy);
if (NULL != tok0)
{
- char * tok1 = token_from_line(NULL);
- if ( parse_player_command_0arg(tok0, tok1)
- || (tok1 && parse_command_1arg(tok0, tok1)))
+
+ if (parse_command(tok0))
{
if (world.exists)
{
}
if (do_record)
{
- save_world();
- record_msg(msg);
+ record(msg, 0);
}
+ char * tokplus = token_from_line(NULL);
+ err_line(NULL != tokplus, "Too many arguments, ignoring overflow.");
free(msg_copy);
return;
}
{
while (1)
{
- server_test();
char * msg = io_round();
+ server_test();
if (NULL == msg)
{
continue;
projects / plomrogue / blobdiff