Update copyright notice.

[empserver] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 73bcf0fc285e582e843d1043b576212b032dcfe2..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,38 +30,31 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1998
+ *     Ron Koenderink, 2004-2005
+ *     Markus Armbruster, 2005
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "proto.h"
-#include "queue.h"
-#include "ioqueue.h"
-#include "tags.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
@@ -79,6 +72,7 @@ int
 main(int ac, char **av)
 {
 #ifdef _WIN32
+    WORD wVersionRequested;
     WSADATA WsaData;
     int err;
     fd_set readfds;
@@ -99,7 +93,6 @@ main(int ac, char **av)
     char *ptr;
     char *auxout_fname;
     FILE *auxout_fp;
-    struct sockaddr_in sin;
     int n;
     char *cname;
     char *pname;
@@ -119,9 +112,10 @@ main(int ac, char **av)
      * after each prompt is required.
      */
     setvbuf(stdout, NULL, _IOLBF, 4096);
-    err = WSAStartup(0x0101, &WsaData);
-    if (err == SOCKET_ERROR) {
-       printf("WSAStartup Failed\n");
+    wVersionRequested = MAKEWORD(2, 0);
+    err = WSAStartup(wVersionRequested, &WsaData);
+    if (err != 0) {
+       printf("WSAStartup Failed, error code %d\n", err);
        return FALSE;
     }
 #else
@@ -161,21 +155,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];
@@ -220,7 +203,7 @@ main(int ac, char **av)
     sa.sa_handler = intr;
     sigaction(SIGINT, &sa, NULL);
     sa.sa_handler = SIG_IGN;
-    sigaction(SIG_IGN, &sa, NULL);
+    sigaction(SIGPIPE, &sa, NULL);
     while (FD_ISSET(sock, &savemask)) {
        mask = savemask;
        n = select(sock + 1, &mask, NULL, NULL, NULL);