/*
* 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>
printf("Usage: %s [OPTION]...[COUNTRY [PASSWORD]]\n"
" -2 FILE Append log of session to FILE\n"
" -k Kill connection\n"
- " -s HOST:PORT Set host and port to connect\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",
char *country;
char *passwd;
char *uname;
+ char *colon;
int sock;
while ((opt = getopt(argc, argv, "2:ks:uhv")) != EOF) {
send_kill = 1;
break;
case 's':
- host = strdup(optarg);
- port = strchr(host, ':');
- if (port == host) { /* if no host specified, then set to null */
- host = NULL;
- }
- if (port) { /* make port the bit after the colon */
- port[0] = 0;
- port++;
- if (port[0] == 0) { /* handle colon-at-end-of-string */
- port = NULL;
- }
+ port = strdup(optarg);
+ colon = strrchr(port, ':');
+ if (colon) {
+ *colon = 0;
+ host = port;
+ port = colon + 1;
}
break;
case 'u':