Refactor file parsing patterns.

[plomrogue] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index c021ef8402df201ad881e8f7ad59d0b75ca02a7a..5f48fa2f85c4decd615037d1e90d222e789610e8 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,18 +1,18 @@
 /* main.c */
 
+#define _POSIX_C_SOURCE 1 /* struct sigaction, sigaction() */
 #include <ncurses.h> /* keypad() */
 #include <signal.h> /* struct 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 "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 */
 
@@ -30,8 +30,6 @@ int main(int argc, char * argv[])
     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);
     char * path_server_in  = "server/in";
     char * path_server_out = "server/out";