X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=c40d7451e2467fa1281a42da461e9575fbab5342;hb=a5b35a816a4a52235aa5c56386193ebdf64619db;hp=c021ef8402df201ad881e8f7ad59d0b75ca02a7a;hpb=d12efb0addf420adc045cfb96647dff6241310ee;p=plomrogue
diff --git a/src/client/main.c b/src/client/main.c
index c021ef8..c40d745 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,18 +1,24 @@
-/* main.c */
-
-#include /* keypad() */
-#include /* struct sigaction, sigaction() */
+/* 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.
+ */
+
+#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 /* 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 "interface_conf.h" /* load_interface_conf(), obey_argv() */
#include "io.h" /* io_loop() */
-#include "misc.h" /* load_interface_conf(), winch_called() */
#include "windows.h" /* winch_called() */
#include "world.h" /* struct World */
@@ -24,14 +30,10 @@ struct World world;
int main(int argc, char * argv[])
{
- char * f_name = "main()";
-
/* Declare hard-coded paths and values here. */
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.winDB.legal_ids = "012cilms";
char * path_server_in = "server/in";
char * path_server_out = "server/out";
@@ -47,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);
@@ -58,13 +61,13 @@ 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", f_name);
+ 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", f_name);
+ world.file_server_out = try_fopen(path_server_out, "r", __func__);
set_cleanup_flag(CLEANUP_SERVER_OUT);
/* This is where most everything happens. */
@@ -72,6 +75,6 @@ int main(int argc, char * argv[])
/* Leave properly. */
cleanup();
- printf("%s\n", quit_msg);
+ exit_trouble(printf("%s\n", quit_msg) < 0, __func__, "printf");
exit(EXIT_SUCCESS);
}