terminal-chess: comparison src/main.c

-:9b64437262a2
+:864f59271974
 #include "colors.h"
 #include <string.h>
 #include <time.h>
 #include <getopt.h>
 #include <locale.h>
+#include <sys/stat.h>
 int get_settings(int argc, char **argv, Settings *settings) {
 char *valid;
 unsigned long int time, port;
 uint8_t timeunit = 60;
 size_t len;
+bool port_set = false;
-for (int opt ; (opt = getopt(argc, argv, "a:bc:Fhp:rsS:t:Uv")) != -1 ;) {
+for (int opt ; (opt = getopt(argc, argv, "a:bc:Fhp:rsS:t:uUv")) != -1 ;) {
 switch (opt) {
 case 'c':
 settings->continuepgn = optarg;
 break;
 case 'b':
 case 's':
 settings->singlemachine = true;
 break;
 case 'F':
 settings->disableflip = true;
+break;
+case 'u':
+if (port_set) {
+fprintf(stderr, "Cannot use Unix domain sockets "
+"when a TCP port was specified.\n");
+return 1;
+}
+settings->usedomainsocket = true;
 break;
 case 'U':
 settings->unicode = false;
 break;
 case 't':
 settings->gameinfo.addtime = time;
 }
 }
 break;
 case 'p':
+if (port_set) {
+fprintf(stderr, "Cannot use -p twice.\n");
+return 1;
+}
+if (settings->usedomainsocket) {
+fprintf(stderr, "Cannot specify TCP port "
+"when using Unix domain sockets.\n");
+return 1;
+}
 port = strtol(optarg, &valid, 10);
 if (port < 1025 || port > 65535 || *valid != '\0') {
 fprintf(stderr,
 "Invalid port number (%s) - choose a number between "
 "1025 and 65535\n",
 optarg);
 return 1;
 } else {
 settings->port = (short) port;
+port_set = true;
 }
 break;
 case 'v':
 printf("terminal-chess : Version %s (Netcode Version %d)\n",
 PROGRAM_VERSION, NETCODE_VERSION);
 "Starts/joins a network chess game\n"
 "\nGeneral options\n"
 "  -c <PGN file> Continue the specified game\n"
 "  -h            This help page\n"
 "  -p            TCP port to use (default: 27015)\n"
+"  -u            Use Unix domain socket instead of TCP\n"
 "  -U            Disables unicode pieces\n"
 "  -v            Print version information and exits\n"
 "\nServer options\n"
 "  -a <time>     Specifies the time to add after each move\n"
 "  -b            Server plays black pieces (default: white)\n"
 "  -r            Distribute color randomly\n"
 "  -t <time>     Specifies time limit (default: no limit)\n"
 "\nHot seat\n"
-"  -s            Play a hot seat game (no client/server)\n"
+"  -s            Play a hot seat game (network options are ignored)\n"
 "  -F            Do not automatically flip the board in hot seat games\n"
 "\nNotes\n"
 "The time unit for -a is seconds and for -t minutes by default. To "
 "specify\nseconds for the -t option, use the s suffix.\n"
 "Example: -t 150s\n\n"
-"Use '-' for PGN files to read PGN data from standard input\n"
+"Use '-' for PGN files to read PGN data from standard input\n\n"
+"When playing over Unix domain socket, the HOST denotes the socket path.\n"
+"When the path doest not exist, a game is created. Otherwise, the program\n"
+"joins the existing game. When HOST is omitted, /tmp/chess.sock is used.\n"
 );
 exit(0);
 }
 }
 if (settings->serverhost) {
 fprintf(stderr, "Can't continue a game when joining a server.\n");
 return 1;
 }
 }
+if (settings->usedomainsocket) {
+if (!settings->serverhost) {
+settings->serverhost = "/tmp/chess.sock";
+}
+struct stat st;
+if (stat(settings->serverhost, &st) == 0) {
+if (S_ISSOCK(st.st_mode)) {
+settings->ishost = false;
+} else {
+fprintf(stderr, "%s is not a Unix domain socket.\n",
+settings->serverhost);
+return 1;
+}
+} else {
+settings->ishost = true;
+}
+} else {
+settings->ishost = !settings->serverhost;
+}
 return 0;
 }
-static Settings default_settings() {
+static Settings settings;
-Settings settings = {0};
+static void init_settings(void) {
+memset(&settings, 0, sizeof(settings));
 settings.gameinfo.servercolor = WHITE;
 settings.port = 27015;
 settings.unicode = !!setlocale(LC_CTYPE, "C.UTF-8");
-return settings;
+}
+static void cleanup() {
+endwin();
+if (settings.usedomainsocket && settings.ishost) {
+remove(settings.serverhost);
+}
 }
 int main(int argc, char **argv) {
 srand(time(NULL));
-Settings settings = default_settings();
+init_settings();
 if (get_settings(argc, argv, &settings)) {
 return 1;
 }
 initscr();
 } else {
 fprintf(stderr, "Non-colored terminals are not supported yet.");
 endwin();
 return EXIT_FAILURE;
 }
-atexit((void(*)())endwin);
+atexit(cleanup);
 int exitcode;
 if (settings.singlemachine) {
 game_play_singlemachine(&settings);
 exitcode = EXIT_SUCCESS;
 } else {
-exitcode = is_server(&settings) ?
+exitcode = settings.ishost ?
 server_run(&settings) : client_run(&settings);
 }
 mvaddstr(getmaxy(stdscr)-1, 0,
 "Game has ended. Press any key to leave...");

Mercurial > hg > terminal-chess / file comparison

comparison: src/main.c

src/main.c