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 4780f9f98b067ff0cfe9dd11fa689b165dc355e8..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-2005, 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.
  *
  *  ---
  *
@@ -49,7 +49,6 @@
 #endif
 #include <signal.h>
 #include <errno.h>
-#include <time.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -88,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;
@@ -98,7 +98,6 @@ main(int ac, char **av)
     char *ptr;
     char *auxout_fname;
     FILE *auxout_fp;
-    struct sockaddr_in sin;
     int n;
     char *cname;
     char *pname;
@@ -160,21 +159,10 @@ main(int ac, char **av)
     port = getenv("EMPIREPORT");
     if (!port)
        port = empireport;
-    if (!hostport(port, &sin)) {
-       fprintf(stderr, "Can't resolve Empire port %s\n", port);
-       exit(1);
-    }
     host = getenv("EMPIREHOST");
     if (!host)
        host = empirehost;
-    if (!hostaddr(host, &sin)) {
-       fprintf(stderr, "Can't resolve Empire host %s\n", host);
-       exit(1);
-    }
-    if ((sock = hostconnect(&sin)) < 0) {
-       perror("Can't connect to Empire server");
-       exit(1);
-    }
+    sock = tcp_connect(host, port);
     cname = getenv("COUNTRY");
     if (ac > 1)
        cname = argv[1];
@@ -214,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);
@@ -250,7 +240,9 @@ main(int ac, char **av)
            }
        }
     }
-#else
+#else  /* _WIN32 */
+    signal(SIGINT, intr);
+
     bRedirected = 0;
     tm.tv_sec = 0;
     tm.tv_usec = 1000;
@@ -323,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 */
@@ -336,9 +328,6 @@ intr(int sig)
 #ifdef _WIN32
     signal(SIGINT, intr);
 #endif
-#ifdef hpux
-    signal(SIGINT, intr);
-#endif
 }
 
 static int