COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index e87200327662b70e773af1d59bc17af4def2afd1..11ed0aff4fed7a5e45dc5c190ab43c8e342586ae 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -32,9 +32,7 @@
  *     Steve McClure, 1998
  */
 
-#ifdef _NTSDK
-#undef _NTSDK
-#endif
+#include <config.h>
 
 #include "misc.h"
 #include "proto.h"
@@ -51,7 +49,6 @@
 #endif
 #include <signal.h>
 #include <errno.h>
-#include <time.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -70,11 +67,12 @@ HANDLE hStdIn;
 
 #define        RETRY   3
 
-int interrupt;
+int eight_bit_clean;
 int sock;
 
+static volatile sig_atomic_t interrupt;
 static void intr(int sig);
-
+static int handleintr(int);
 
 int
 main(int ac, char **av)
@@ -89,6 +87,7 @@ main(int ac, char **av)
     int bRedirected = 0;
     char unamebuf[128];
 #else
+    struct sigaction sa;
     fd_set mask;
     fd_set savemask;
     int retry = 0;
@@ -99,14 +98,25 @@ main(int ac, char **av)
     char *ptr;
     char *auxout_fname;
     FILE *auxout_fp;
-    struct sockaddr_in sin;
     int n;
     char *cname;
     char *pname;
     char *uname;
+    char *host;
+    char *port;
     int send_kill = 0;
+    int utf8 = 0;
 
 #ifdef _WIN32
+    /*
+     * stdout is unbuffered under Windows if connected to a character
+     * device, and putchar() screws up when printing multibyte strings
+     * bytewise to an unbuffered stream.  Switch stdout to line-
+     * buffered mode.  Unfortunately, ISO C allows implementations to
+     * screw that up, and of course Windows does.  Manual flushing
+     * after each prompt is required.
+     */
+    setvbuf(stdout, NULL, _IOLBF, 4096);
     err = WSAStartup(0x0101, &WsaData);
     if (err == SOCKET_ERROR) {
        printf("WSAStartup Failed\n");
@@ -122,7 +132,7 @@ main(int ac, char **av)
     auxout_fp = NULL;
     for (i = j = 1; i < ac; ++i) {
        ptr = argv[i];
-       if (strcmp(ptr, "-2") == NULL) {
+       if (strcmp(ptr, "-2") == 0) {
            if (i + 1 >= ac) {
                fprintf(stderr, "-2: Missing filename!\n");
                exit(1);
@@ -130,9 +140,12 @@ main(int ac, char **av)
            auxout_fname = argv[i + 1];
            ++i;
            continue;
-       } else if (strcmp(ptr, "-k") == NULL) {
+       } else if (strcmp(ptr, "-k") == 0) {
            send_kill = 1;
            continue;
+       } else if (strcmp(ptr, "-u") == 0) {
+           utf8 = eight_bit_clean = 1;
+           continue;
        }
        argv[j] = argv[i];
        ++j;
@@ -143,18 +156,13 @@ main(int ac, char **av)
        exit(1);
     }
     getsose();
-    if (!hostport(getenv("EMPIREPORT"), &sin) &&
-       !hostport("empire", &sin) && !hostport(empireport, &sin)) {
-       fprintf(stderr, "No empire port\n");
-       exit(1);
-    }
-    if (!hostaddr(getenv("EMPIREHOST"), &sin) &&
-       !hostaddr(empirehost, &sin)) {
-       fprintf(stderr, "No empire host\n");
-       exit(1);
-    }
-    if ((sock = hostconnect(&sin)) < 0)
-       exit(1);
+    port = getenv("EMPIREPORT");
+    if (!port)
+       port = empireport;
+    host = getenv("EMPIREHOST");
+    if (!host)
+       host = empirehost;
+    sock = tcp_connect(host, port);
     cname = getenv("COUNTRY");
     if (ac > 1)
        cname = argv[1];
@@ -184,7 +192,7 @@ main(int ac, char **av)
            uname = "nobody";
 #endif
     }
-    if (!login(sock, uname, cname, pname, send_kill)) {
+    if (!login(sock, uname, cname, pname, send_kill, utf8)) {
        close(sock);
        exit(1);
     }
@@ -194,10 +202,12 @@ main(int ac, char **av)
     FD_ZERO(&mask);
     FD_SET(0, &savemask);
     FD_SET(sock, &savemask);
-#endif
-    (void)signal(SIGINT, intr);
-#ifndef _WIN32
-    (void)signal(SIGPIPE, SIG_IGN);
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = 0;
+    sa.sa_handler = intr;
+    sigaction(SIGINT, &sa, NULL);
+    sa.sa_handler = SIG_IGN;
+    sigaction(SIGPIPE, &sa, NULL);
     while (FD_ISSET(sock, &savemask)) {
        mask = savemask;
        n = select(sock + 1, &mask, NULL, NULL, NULL);
@@ -230,7 +240,9 @@ main(int ac, char **av)
            }
        }
     }
-#else
+#else  /* _WIN32 */
+    signal(SIGINT, intr);
+
     bRedirected = 0;
     tm.tv_sec = 0;
     tm.tv_usec = 1000;
@@ -270,7 +282,7 @@ main(int ac, char **av)
     while (1) {
        FD_ZERO(&readfds);
        FD_SET(sock, &readfds);
-       n = select(sock + 1, &readfds, NULL, NULL, (struct timeval *)&tm);
+       n = select(sock + 1, &readfds, NULL, NULL, &tm);
        if (interrupt) {
            if (!handleintr(sock))
                break;
@@ -303,7 +315,7 @@ main(int ac, char **av)
     }
     if (bRedirected == 0)
        CloseHandle(hStdIn);
-#endif
+#endif /* _WIN32 */
     ioq_drain(&server);
     (void)close(sock);
     return 0;                  /* Shut the compiler up */
@@ -312,11 +324,24 @@ main(int ac, char **av)
 static void
 intr(int sig)
 {
-    interrupt++;
+    interrupt = 1;
 #ifdef _WIN32
     signal(SIGINT, intr);
 #endif
-#ifdef hpux
-    signal(SIGINT, intr);
+}
+
+static int
+handleintr(int s)
+{
+    if (interrupt) {
+       /* tacky, but it works */
+#if !defined(_WIN32)
+       if (write(s, "\naborted\n", 1 + 7 + 1) <= 0)
+#else
+       if (send(s, "\naborted\n", 1 + 7 + 1, 0) <= 0)
 #endif
+           return 0;
+       interrupt = 0;
+    }
+    return 1;
 }