/*
* 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
*
* ---
*
- * 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.
*
* ---
*
* Steve McClure, 1998
*/
-#ifdef _NTSDK
-#undef _NTSDK
-#endif
+#include <config.h>
#include "misc.h"
#include "proto.h"
#endif
#include <signal.h>
#include <errno.h>
-#include <time.h>
#ifndef _WIN32
#include <sys/socket.h>
#include <sys/time.h>
#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)
int bRedirected = 0;
char unamebuf[128];
#else
+ struct sigaction sa;
fd_set mask;
fd_set savemask;
int retry = 0;
char *ptr;
char *auxout_fname;
FILE *auxout_fp;
- struct sockaddr_in sin;
int n;
char *cname;
char *pname;
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];
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);
}
}
}
-#else
+#else /* _WIN32 */
+ signal(SIGINT, intr);
+
bRedirected = 0;
tm.tv_sec = 0;
tm.tv_usec = 1000;
}
if (bRedirected == 0)
CloseHandle(hStdIn);
-#endif
+#endif /* _WIN32 */
ioq_drain(&server);
(void)close(sock);
return 0; /* Shut the compiler up */
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;
}