From: Christian Heller Date: Mon, 17 Mar 2014 03:50:48 +0000 (+0100) Subject: Re-factored server's main() into smaller routines in init.c. X-Git-Tag: tce~821 X-Git-Url: https://plomlompom.com/repos/do_day?a=commitdiff_plain;h=1a8b80508bc0bc6d9e9d3f8c48a8c7c40675c61f;p=plomrogue Re-factored server's main() into smaller routines in init.c. --- diff --git a/src/server/init.c b/src/server/init.c index c06619f..75b224c 100644 --- a/src/server/init.c +++ b/src/server/init.c @@ -1,18 +1,26 @@ /* src/server/init.c */ #include "init.h" +#include /* global errno, EEXIST */ #include /* NULL */ #include /* uint32_t */ +#include /* sprintf(), fflush() */ #include /* exit(), free() */ -#include /* atoi() */ +#include /* atoi(), strlen() */ +#include /* mkdir() */ +#include /* defines pid_t, time_t */ #include /* time() */ -#include /* optarg, getopt(), access(), unlink() */ +#include /* optarg, getopt(), access(), unlink(), getpid() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_width(), - * try_fgets() + * try_fgets(), try_fwrite() */ #include "../common/rexit.h" /* exit_err() */ +#include "../common/try_malloc.h" /* try_malloc() */ #include "cleanup.h" /* set_cleanup_flag() */ -#include "map_objects.h" /* free_map_objects(), add_map_objects() */ +#include "map_object_actions.h" /* init_map_object_actions() */ +#include "map_objects.h" /* free_map_objects(), add_map_objects(), + * init_map_object_defs() + */ #include "map.h" /* init_map() */ #include "rrand.h" /* rrand() */ #include "run.h" /* obey_msg(), io_loop() */ @@ -46,6 +54,46 @@ extern void obey_argv(int argc, char * argv[]) +extern void init_map_and_map_objects_configs() +{ + world.map.size.x = 64; + world.map.size.y = 64; + world.map.dist_orthogonal = 5; + world.map.dist_diagonal = 7; + char * err_mod = "No map object definitions file."; + char * err_moa = "No map object actions file."; + exit_err(access(world.path_map_obj_defs, F_OK), err_mod); + exit_err(access(world.path_map_obj_acts, F_OK), err_moa); + init_map_object_defs(); + init_map_object_actions(); +} + + + +extern void setup_server_io() +{ + char * f_name = "setup_server_io()"; + int test = mkdir("server", 0700); + exit_trouble(test && EEXIST != errno, f_name, "mkdir()"); + world.file_out = try_fopen(world.path_out, "w", f_name); + world.server_test = try_malloc(10 + 1 + 10 + 1 + 1, f_name); + sprintf(world.server_test, "%d %d\n", getpid(), (int) time(0)); + try_fwrite(world.server_test, strlen(world.server_test), 1, + world.file_out, f_name); + fflush(world.file_out); + set_cleanup_flag(CLEANUP_OUT); + if (!access(world.path_in, F_OK)) /* This keeps out input from old input */ + { /* file streams of clients */ + unlink(world.path_in); /* communicating with server processes */ + } /* superseded by this current one. */ + world.file_in = try_fopen(world.path_in, "w", f_name); + try_fclose(world.file_in, f_name); + world.file_in = try_fopen(world.path_in, "r", f_name); + set_cleanup_flag(CLEANUP_IN); +} + + + extern void remake_world(uint32_t seed) { char * f_name = "remake_world()"; diff --git a/src/server/init.h b/src/server/init.h index bc5c76c..a906273 100644 --- a/src/server/init.h +++ b/src/server/init.h @@ -13,6 +13,12 @@ /* Parses command line arguments -v and -s into server configuration. */ extern void obey_argv(int argc, char * argv[]); +/* Set map geometry and, from config files, map object (action) definitions. */ +extern void init_map_and_map_objects_configs(); + +/* Start server in file and out file, latter with server process test string. */ +extern void setup_server_io(); + /* Dissolves old game world if it exists, and generates a new one from "seed". * Unlinks a pre-existing file at world.path_record if called on a world.turn>0, * i.e. if called after iterating through an already established game world. diff --git a/src/server/main.c b/src/server/main.c index 769d47c..0c1e639 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -1,22 +1,13 @@ /* src/server/main.c */ -#include /* global errno */ -#include /* printf(), fflush() */ +#include /* printf() */ #include /* exit() */ -#include /* strlen() */ -#include /* mkfifo(), mkdir() */ -#include /* defines pid_t, time_t */ -#include /* #time() */ -#include /* access(), getpid(), unlink() */ #include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */ -#include "../common/readwrite.h" /* try_fopen(), try_fwrite(), try_fclose() */ #include "../common/rexit.h" /* exit_err, set_cleanup_func() */ -#include "../common/try_malloc.h" /* try_malloc() */ #include "cleanup.h" /* set_cleanup_flag(), cleanup() */ -#include "init.h" /* run_game(), obey_argv() */ -#include "map_object_actions.h" /* init_map_object_actions() */ -#include "map_objects.h" /* init_map_object_defs() */ -#include "run.h" /* obey_argv(), run_game() */ +#include "init.h" /* run_game(), obey_argv(), obey_argv(), setup_server_io(), + * init_map_and_map_object_configs() + */ #include "world.h" /* struct World */ @@ -27,8 +18,6 @@ struct World world; int main(int argc, char ** argv) { - char * f_name = "main()"; - /* So error exits also go through the server's cleanup() function. */ set_cleanup_func(cleanup); @@ -55,44 +44,9 @@ int main(int argc, char ** argv) world.tmp_suffix = "_tmp"; set_err_try_fgets_delim("%%\n"); - /* Set map geometry. */ - world.map.size.x = 64; - world.map.size.y = 64; - world.map.dist_orthogonal = 5; - world.map.dist_diagonal = 7; - - /* Check existence of config files. */ - char * err_mod = "No map object definitions file."; - char * err_moa = "No map object actions file."; - exit_err(access(world.path_map_obj_defs, F_OK), err_mod); - exit_err(access(world.path_map_obj_acts, F_OK), err_moa); - - /* Init from config files map object (action) definitions. */ - init_map_object_defs(); - init_map_object_actions(); - - /* Create server directory if it does not exist yet. */ - int test = mkdir("server", 0700); - exit_trouble(test && EEXIST != errno, f_name, "mkdir()"); - - /* Create server out file and start it with server process test string. */ - world.file_out = try_fopen(world.path_out, "w", f_name); - world.server_test = try_malloc(10 + 1 + 10 + 1 + 1, f_name); - sprintf(world.server_test, "%d %d\n", getpid(), (int) time(0)); - try_fwrite(world.server_test, strlen(world.server_test), 1, - world.file_out, f_name); - fflush(world.file_out); - set_cleanup_flag(CLEANUP_OUT); - - /* Create server in file, switch to reading it. */ - if (!access(world.path_in, F_OK)) /* This keeps out input from old input */ - { /* file streams of clients */ - unlink(world.path_in); /* communicating with server processes */ - } /* superseded by this current one. */ - world.file_in = try_fopen(world.path_in, "w", f_name); - try_fclose(world.file_in, f_name); - world.file_in = try_fopen(world.path_in, "r", f_name); - set_cleanup_flag(CLEANUP_IN); + /* Init map, map object configurations and server i/o files. */ + init_map_and_map_objects_configs(); + setup_server_io(); /* Enter play or replay mode loops, then leave properly. */ run_game();