X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fmain.c;h=c40d7451e2467fa1281a42da461e9575fbab5342;hb=a4df5c24eca01a771060b130ed7f4c20d9f73778;hp=3abb44a13ad889e67253e38e9b24590cbf4713a4;hpb=a053b626309d3d9c51caecf35a018b6e1df5ecb5;p=plomrogue
diff --git a/src/client/main.c b/src/client/main.c
index 3abb44a..c40d745 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,16 +1,25 @@
-/* main.c */
+/* main.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
-#include /* keypad() */
-#include /* struct sigaction, sigaction() */
+#define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
+#define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
+#include /* keypad(), start_color() */
+#include /* SIGWINCH, sigaction, sigaction() */
#include /* NULL */
#include /* exit() */
#include /* memset() */
-#include "../common/rexit.h" /* set_cleanup_func(), exit_trouble() */
+#include /* access() */
+#include "../common/readwrite.h" /* try_fopen() */
+#include "../common/rexit.h" /* set_cleanup_func(), exit_trouble(),exit_err() */
#include "cleanup.h" /* cleanup(), set_cleanup_flag() */
#include "command_db.h" /* init_command_db() */
-#include "io.h" /* io_loop(), try_send() */
-#include "misc.h" /* load_interface_conf(), winch_called() */
-#include "windows.h" /* struct Win, winch_called() */
+#include "interface_conf.h" /* load_interface_conf(), obey_argv() */
+#include "io.h" /* io_loop() */
+#include "windows.h" /* winch_called() */
#include "world.h" /* struct World */
@@ -21,11 +30,12 @@ struct World world;
int main(int argc, char * argv[])
{
- char * f_name = "main()";
-
- /* Declare hard-coded paths here. */
- world.path_server_in = "server/in";
- world.path_interface_conf = "confclient/interface_conf";
+ /* Declare hard-coded paths and values here. */
+ world.path_commands = "confclient/commands";
+ world.path_interface = "confclient/interface_conf";
+ world.winDB.legal_ids = "012cilms";
+ char * path_server_in = "server/in";
+ char * path_server_out = "server/out";
/* Parse command line arguments. */
obey_argv(argc, argv);
@@ -33,8 +43,13 @@ int main(int argc, char * argv[])
/* So error exits also go through the client's cleanup() function. */
set_cleanup_func(cleanup);
+ /* Check existence of config files. */
+ exit_err(access(world.path_commands, F_OK), "No commands config file.");
+ exit_err(access(world.path_interface, F_OK), "No interface config file.");
+
/* Initialize the whole interface. */
world.winDB.t_screen = initscr();
+ start_color();
set_cleanup_flag(CLEANUP_NCURSES);
noecho();
curs_set(0);
@@ -46,13 +61,20 @@ int main(int argc, char * argv[])
struct sigaction act;
memset(&act, 0, sizeof(act));
act.sa_handler = &winch_called;
- exit_trouble(sigaction(SIGWINCH, &act, NULL), f_name, "sigaction()");
+ exit_trouble(sigaction(SIGWINCH, &act, NULL), __func__, "sigaction");
+
+ /* Open file streams for communicating with the server. */
+ exit_err(access(path_server_in, F_OK), "No server input file found.");
+ world.file_server_in = try_fopen(path_server_in, "a", __func__);
+ set_cleanup_flag(CLEANUP_SERVER_IN);
+ world.file_server_out = try_fopen(path_server_out, "r", __func__);
+ set_cleanup_flag(CLEANUP_SERVER_OUT);
/* This is where most everything happens. */
char * quit_msg = io_loop();
/* Leave properly. */
cleanup();
- printf("%s\n", quit_msg);
+ exit_trouble(printf("%s\n", quit_msg) < 0, __func__, "printf");
exit(EXIT_SUCCESS);
}