X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=c40d7451e2467fa1281a42da461e9575fbab5342;hb=a18ffcfc0b1527b5751ff9c76b8bdb7ee181a764;hp=c25c4f9b509ab91dd3789e78384c4f2c1e042628;hpb=6f98f0b029c3e84f1df0f2f3642f88e91b17cf33;p=plomrogue

diff --git a/src/client/main.c b/src/client/main.c
index c25c4f9..c40d745 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,17 +1,24 @@
-/* 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 <ncurses.h> /* keypad() */
-#include <signal.h> /* struct sigaction, sigaction() */
+#define _POSIX_C_SOURCE 1 /* sigaction, sigaction() */
+#define _DARWIN_C_SOURCE 1 /* SIGWINCH on OS X */
+#include <ncurses.h> /* keypad(), start_color() */
+#include <signal.h> /* SIGWINCH, sigaction, sigaction() */
 #include <stddef.h> /* NULL */
 #include <stdlib.h> /* exit() */
 #include <string.h> /* memset() */
 #include <unistd.h> /* access() */
-#include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
+#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 "interface_conf.h" /* load_interface_conf(), obey_argv() */
+#include "io.h" /* io_loop() */
 #include "windows.h" /* winch_called() */
 #include "world.h" /* struct World */
 
@@ -23,15 +30,12 @@ struct World world;
 
 int main(int argc, char * argv[])
 {
-    char * f_name = "main()";
-
     /* Declare hard-coded paths and values here. */
-    world.path_server_in  = "server/in";
-    world.path_commands   = "confclient/commands";
-    world.path_interface  = "confclient/interface_conf";
-    world.winDB.legal_ids = "012ciklm";
-    world.delim           = "%\n";
-    set_err_try_fgets_delim(world.delim);
+    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);
@@ -45,6 +49,7 @@ int main(int argc, char * argv[])
 
     /* Initialize the whole interface. */
     world.winDB.t_screen = initscr();
+    start_color();
     set_cleanup_flag(CLEANUP_NCURSES);
     noecho();
     curs_set(0);
@@ -56,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);
 }