/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, 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
*
* ---
*
- * 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.
*
* ---
*
* 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
#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, s_char **av)
+main(int ac, char **av)
{
#ifdef _WIN32
+ WORD wVersionRequested;
WSADATA WsaData;
int err;
fd_set readfds;
struct timeval tm;
DWORD stdinmode;
SECURITY_ATTRIBUTES security;
-#endif
+ int bRedirected = 0;
+ char unamebuf[128];
+#else
+ struct sigaction sa;
fd_set mask;
+ fd_set savemask;
+ int retry = 0;
+#endif
struct ioqueue server;
- s_char *argv[128];
+ char *argv[128];
int i, j;
- s_char *ptr;
- s_char *auxout_fname;
+ char *ptr;
+ char *auxout_fname;
FILE *auxout_fp;
-#ifndef _WIN32
- fd_set savemask;
- struct passwd *pwd;
-#endif
- struct sockaddr_in sin;
int n;
- s_char *cname;
- s_char *pname;
- int retry = 0;
+ 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
#endif
memset(argv, 0, sizeof(argv));
saveargv(ac, av, argv);
- auxout_fname = 0;
- auxout_fp = 0;
+ auxout_fname = NULL;
+ auxout_fp = NULL;
for (i = j = 1; i < ac; ++i) {
ptr = argv[i];
if (strcmp(ptr, "-2") == 0) {
} 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;
fprintf(stderr, "Unable to open %s for append\n", auxout_fname);
exit(1);
}
-#ifndef _WIN32
- pwd = getpwuid(getuid());
- if (pwd == NULL) {
- fprintf(stderr, "You don't exist. Go away\n");
- exit(1);
- }
-#endif
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");
- pname = getenv("PLAYER");
if (ac > 1)
cname = argv[1];
+ pname = getenv("PLAYER");
if (ac > 2)
pname = argv[2];
+ uname = getenv("LOGNAME");
+ if (uname == NULL) {
#ifndef _WIN32
- if (!login(sock, pwd->pw_name, cname, pname, send_kill)) {
+ struct passwd *pwd;
+
+ pwd = getpwuid(getuid());
+ if (pwd == NULL) {
+ fprintf(stderr, "You don't exist. Go away\n");
+ exit(1);
+ }
+ uname = pwd->pw_name;
#else
- if (!login(sock, "nobody", cname, pname, send_kill)) {
+ DWORD unamesize;
+
+ unamesize = sizeof(unamebuf);
+ if (GetUserName(unamebuf, &unamesize)) {
+ uname = unamebuf;
+ if ((unamesize <= 0 ) || (strlen(uname) <= 0))
+ uname = "nobody";
+ } else
+ uname = "nobody";
#endif
+ }
+ if (!login(sock, uname, cname, pname, send_kill, utf8)) {
close(sock);
exit(1);
}
ioq_init(&server, 2048);
io_init();
- FD_ZERO(&mask);
#ifndef _WIN32
+ 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, (fd_set *)0, (fd_set *)0,
- (struct timeval *)0);
+ n = select(sock + 1, &mask, NULL, NULL, NULL);
if (interrupt) {
if (!handleintr(sock))
break;
}
}
}
-#else
+#else /* _WIN32 */
+ signal(SIGINT, intr);
+
+ bRedirected = 0;
tm.tv_sec = 0;
tm.tv_usec = 1000;
- security.nLength = sizeof(SECURITY_ATTRIBUTES);
- security.lpSecurityDescriptor = NULL;
- security.bInheritHandle = TRUE;
- hStdIn = CreateFile("CONIN$",
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- &security, OPEN_EXISTING, (DWORD) NULL, NULL);
-
- if (hStdIn == INVALID_HANDLE_VALUE) {
- printf("Error getting hStdIn.\n");
- fflush(stdout);
- }
- err = GetConsoleMode(hStdIn, &stdinmode);
- if (!err) {
- printf("Error getting console mode.\n");
- fflush(stdout);
- }
- stdinmode |= ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT;
- err = SetConsoleMode(hStdIn, stdinmode);
- if (!err) {
- printf("Error setting console mode.\n");
- fflush(stdout);
+ if (!_isatty(_fileno(stdin)))
+ bRedirected = 1;
+ else {
+ security.nLength = sizeof(SECURITY_ATTRIBUTES);
+ security.lpSecurityDescriptor = NULL;
+ security.bInheritHandle = TRUE;
+ hStdIn = CreateFile("CONIN$",
+ GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ &security, OPEN_EXISTING, (DWORD) NULL, NULL);
+
+ if (hStdIn == INVALID_HANDLE_VALUE) {
+ printf("Error getting hStdIn.\n");
+ fflush(stdout);
+ exit(-3);
+ }
+
+ err = GetConsoleMode(hStdIn, &stdinmode);
+ if (!err) {
+ printf("Error getting console mode.\n");
+ fflush(stdout);
+ exit(-4);
+ } else {
+ stdinmode |= ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT;
+ err = SetConsoleMode(hStdIn, stdinmode);
+ if (!err) {
+ printf("Error setting console mode.\n");
+ fflush(stdout);
+ exit(-5);
+ }
+ }
}
while (1) {
FD_ZERO(&readfds);
FD_SET(sock, &readfds);
- n = select(sock + 1, &readfds, (fd_set *) 0, (fd_set *) 0,
- (struct timeval *)&tm);
+ n = select(sock + 1, &readfds, NULL, NULL, &tm);
if (interrupt) {
if (!handleintr(sock))
break;
break;
}
} else {
- if (WaitForSingleObject(hStdIn, 10) != WAIT_TIMEOUT) {
- if (!termio(-1, sock, auxout_fp)) {
- if (retry++ >= RETRY) {
- ;
- }
- } else {
- retry = 0;
+ if (bRedirected == 1) {
+ if (!termio(0, sock, auxout_fp))
+ bRedirected = -1;
+ } else if (bRedirected == 0) {
+ if (WaitForSingleObject(hStdIn, 10) != WAIT_TIMEOUT) {
+ termio(-1, sock, auxout_fp);
+ FlushConsoleInputBuffer(hStdIn);
}
- FlushConsoleInputBuffer(hStdIn);
}
if (FD_ISSET(sock, &readfds)) {
if (!serverio(sock, &server))
}
}
}
- CloseHandle(hStdIn);
-#endif
+ if (bRedirected == 0)
+ CloseHandle(hStdIn);
+#endif /* _WIN32 */
ioq_drain(&server);
(void)close(sock);
- exit(0);
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;
}
projects / empserver / blobdiff