/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* Dave Pare, 1986
* Steve McClure, 1998
* Ron Koenderink, 2004-2007
- * Markus Armbruster, 2005-2009
+ * Markus Armbruster, 2005-2010
+ * Tom Dickson-Hunt, 2010
*/
#include <config.h>
#include <stdlib.h>
+#include <string.h>
#ifdef _WIN32
#include <windows.h>
#include "sys/socket.h"
printf("Usage: %s [OPTION]...[COUNTRY [PASSWORD]]\n"
" -2 FILE Append log of session to FILE\n"
" -k Kill connection\n"
+ " -s [HOST:]PORT Specify server HOST and PORT\n"
" -u Use UTF-8\n"
" -h display this help and exit\n"
" -v display version information and exit\n",
int opt;
char *auxfname = NULL;
int send_kill = 0;
+ char *host = NULL;
+ char *port = NULL;
int utf8 = 0;
char **ap;
char *country;
char *passwd;
char *uname;
- char *host;
- char *port;
+ char *colon;
int sock;
- while ((opt = getopt(argc, argv, "2:kuhv")) != EOF) {
+ while ((opt = getopt(argc, argv, "2:ks:uhv")) != EOF) {
switch (opt) {
case '2':
auxfname = optarg;
case 'k':
send_kill = 1;
break;
+ case 's':
+ port = strdup(optarg);
+ colon = strrchr(port, ':');
+ if (colon) {
+ *colon = 0;
+ host = port;
+ port = colon + 1;
+ }
+ break;
case 'u':
utf8 = eight_bit_clean = 1;
break;
passwd = *ap++;
else
passwd = getenv("PLAYER");
- port = getenv("EMPIREPORT");
+ if (!port)
+ port = getenv("EMPIREPORT");
if (!port)
port = empireport;
- host = getenv("EMPIREHOST");
+ if (!host)
+ host = getenv("EMPIREHOST");
if (!host)
host = empirehost;
uname = getenv("LOGNAME");
}
uname = pwd->pw_name;
}
+ if (*ap) {
+ fprintf(stderr, "%s: extra operand %s\n", argv[0], *ap);
+ fprintf(stderr, "Try -h for help.\n");
+ exit(1);
+ }
getsose();
if (auxfname && (auxfp = fopen(auxfname, "a")) == NULL) {