/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, 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/>.
*
* ---
*
* ---
*
* servercmd.c: Change the state depending on the command from the server.
- *
+ *
* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 1998
* Ron Koenderink, 2005
- * Markus Armbruster, 2005-2007
+ * Markus Armbruster, 2005-2010
*/
#include <config.h>
fprintf(auxfp, "\n%s", arg);
break;
case C_INFORM:
- if (*arg) {
- snprintf(teles, sizeof(teles), "(%.*s )", len -1, arg);
+ if (arg[0] != '\n') {
+ snprintf(teles, sizeof(teles), "(%.*s) ", len - 1, arg);
if (!redir_fp) {
putchar('\07');
prompt(code, the_prompt, teles);
}
static int
-redir_authorized(char *arg, char *attempt)
+redir_authorized(char *arg, char *attempt, int expected)
{
size_t seen = seen_input(arg);
if (executing) {
- fprintf(stderr, "Can't %s in a script\n", attempt);
+ fprintf(stderr, "Can't %s in a batch file\n", attempt);
+ return 0;
+ }
+
+ if (!expected) {
+ fprintf(stderr, "WARNING! Server attempted to %s unexpectedly\n",
+ attempt);
return 0;
}
int mode;
int fd;
- if (redir_fp) {
- (void)fclose(redir_fp);
- redir_fp = NULL;
- }
-
- if (!redir_authorized(p, "redirect to file"))
+ if (!redir_authorized(p, "redirect to file", !redir_fp))
return;
if (*p++ != '>') {
fprintf(stderr, "WARNING! Weird redirection %s", p);
static void
dopipe(char *p)
{
- if (!redir_authorized(p, "pipe to shell command"))
+ if (!redir_authorized(p, "pipe to shell command", !redir_fp))
return;
if (*p++ != '|') {
fprintf(stderr, "WARNING! Weird pipe %s", p);
{
int fd;
- if (!redir_authorized(p, "execute script file"))
+ if (!redir_authorized(p, "execute batch file", 1))
return -1;
p = fname(p);