Update copyright notice

[empserver] / src / client / servcmd.c

diff --git a/src/client/servcmd.c b/src/client/servcmd.c
index 0e17a770ad502623f63274f3284595bc11fdb0db..b818b0dedbb0fccdd00cf76c02e80b5ee1530ed2 100644 (file)
--- a/src/client/servcmd.c
+++ b/src/client/servcmd.c
@@ -1,11 +1,11 @@
 /*
  *  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-2012, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,12 +25,12 @@
  *  ---
  *
  *  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>
@@ -50,7 +49,7 @@ int eight_bit_clean;
 FILE *auxfp;
 
 static FILE *redir_fp;
-static FILE *pipe_fp;
+static int redir_is_pipe;
 static int executing;
 static size_t input_to_forget;
 
@@ -73,6 +72,17 @@ servercmd(int code, char *arg, int len)
        }
        snprintf(the_prompt, sizeof(the_prompt), "[%d:%d] Command : ",
                 nmin, nbtu);
+       if (redir_fp) {
+           if (redir_is_pipe)
+               (void)pclose(redir_fp);
+           else
+               (void)fclose(redir_fp);
+           redir_fp = NULL;
+       }
+       if (input_to_forget) {
+           forget_input(input_to_forget);
+           input_to_forget = 0;
+       }
        prompt(code, the_prompt, teles);
        executing = 0;
        break;
@@ -100,9 +110,9 @@ servercmd(int code, char *arg, int len)
            fprintf(auxfp, "\n%s", arg);
        break;
     case C_INFORM:
-       if (*arg) {
-           snprintf(teles, sizeof(teles), "(%.*s )", len -1, arg);
-           if (!redir_fp && !pipe_fp) {
+       if (arg[0] != '\n') {
+           snprintf(teles, sizeof(teles), "(%.*s) ", len - 1, arg);
+           if (!redir_fp) {
                putchar('\07');
                prompt(code, the_prompt, teles);
            }
@@ -126,20 +136,6 @@ prompt(int code, char *prompt, char *teles)
 {
     char *nl;
 
-    if (code == C_PROMPT) {
-       if (redir_fp) {
-           (void)fclose(redir_fp);
-           redir_fp = NULL;
-       } else if (pipe_fp) {
-           (void)pclose(pipe_fp);
-           pipe_fp = NULL;
-       }
-       if (input_to_forget) {
-           forget_input(input_to_forget);
-           input_to_forget = 0;
-       }
-    }
-
     nl = code == C_PROMPT || code == C_INFORM ? "\n" : "";
     printf("%s%s%s", nl, teles, prompt);
     fflush(stdout);
@@ -161,12 +157,18 @@ fname(char *s)
 }
 
 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;
     }
 
@@ -179,21 +181,13 @@ redir_authorized(char *arg, char *attempt)
     return 1;
 }
 
-/*
- * opens redir_fp if successful
- */
 static void
 doredir(char *p)
 {
     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);
@@ -216,6 +210,7 @@ doredir(char *p)
        return;
     }
 
+    redir_is_pipe = 0;
     fd = open(p, mode, 0666);
     redir_fp = fd < 0 ? NULL : fdopen(fd, "w");
     if (!redir_fp) {
@@ -224,13 +219,10 @@ doredir(char *p)
     }
 }
 
-/*
- * opens "pipe_fp" if successful
- */
 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);
@@ -243,7 +235,8 @@ dopipe(char *p)
        return;
     }
 
-    if ((pipe_fp = popen(p, "w")) == NULL) {
+    redir_is_pipe = 1;
+    if ((redir_fp = popen(p, "w")) == NULL) {
        fprintf(stderr, "Can't redirect to pipe %s: %s\n",
                p, strerror(errno));
     }
@@ -254,7 +247,7 @@ doexecute(char *p)
 {
     int fd;
 
-    if (!redir_authorized(p, "execute script file"))
+    if (!redir_authorized(p, "execute batch file", 1))
        return -1;
 
     p = fname(p);
@@ -279,8 +272,6 @@ outch(char c)
        putc(c, auxfp);
     if (redir_fp)
        putc(c, redir_fp);
-    else if (pipe_fp)
-       putc(c, pipe_fp);
     else if (eight_bit_clean) {
        if (c == 14)
            putso();