Update copyright notice.

[empserver] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index f56bd44f461a93dd205df3d0abeffaf6c6169304..855925227a56862f8340a0c6abfaa35fcd22f26b 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-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, 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.
  *
  *  ---
  *
@@ -30,40 +30,31 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1998
+ *     Ron Koenderink, 2004-2005
+ *     Markus Armbruster, 2005
  */
 
-#ifdef _NTSDK
-#undef _NTSDK
-#endif
-
-#include "misc.h"
-#include "proto.h"
-#include "queue.h"
-#include "ioqueue.h"
-#include "tags.h"
+#include <config.h>
 
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#ifndef _WIN32
-#include <pwd.h>
-#endif
-#include <signal.h>
-#include <errno.h>
-#include <time.h>
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#else
+#ifdef _WIN32
 #include <windows.h>
-#include <winsock.h>
 #include <conio.h>
 #include <io.h>
+#else
+#include <pwd.h>
+#include <unistd.h>
 #endif
 
+#include "ioqueue.h"
+#include "misc.h"
+#include "proto.h"
+#include "tags.h"
+
 #ifdef _WIN32
 HANDLE hStdIn;
 #endif
@@ -71,16 +62,17 @@ HANDLE hStdIn;
 #define        RETRY   3
 
 int eight_bit_clean;
-int interrupt;
 int sock;
 
+static volatile sig_atomic_t interrupt;
 static void intr(int sig);
-
+static int handleintr(int);
 
 int
 main(int ac, char **av)
 {
 #ifdef _WIN32
+    WORD wVersionRequested;
     WSADATA WsaData;
     int err;
     fd_set readfds;
@@ -90,6 +82,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;
@@ -100,18 +93,29 @@ 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
-    err = WSAStartup(0x0101, &WsaData);
-    if (err == SOCKET_ERROR) {
-       printf("WSAStartup Failed\n");
+    /*
+     * 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);
+    wVersionRequested = MAKEWORD(2, 0);
+    err = WSAStartup(wVersionRequested, &WsaData);
+    if (err != 0) {
+       printf("WSAStartup Failed, error code %d\n", err);
        return FALSE;
     }
 #else
@@ -148,18 +152,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];
@@ -199,10 +198,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);
@@ -235,7 +236,9 @@ main(int ac, char **av)
            }
        }
     }
-#else
+#else  /* _WIN32 */
+    signal(SIGINT, intr);
+
     bRedirected = 0;
     tm.tv_sec = 0;
     tm.tv_usec = 1000;
@@ -308,7 +311,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 */
@@ -317,11 +320,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;
 }