Update copyright notice

[empserver] / src / lib / subs / getele.c

diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c
index 8e1a6192203203aefdfecdb8f5cd55d034b95856..a5845720bbab8c93de667ef500158a4996596ba8 100644 (file)
--- a/src/lib/subs/getele.c
+++ b/src/lib/subs/getele.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2018, 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,34 +14,34 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  getele.c: Read a telegram from a file or stdin and send it to a country
- * 
+ *
  *  Known contributors to this file:
- *    
+ *     Ron Koenderink, 2005
+ *     Markus Armbruster, 2005-2009
+ *
  */
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "tel.h"
+#include <config.h>
+
 #include "prototypes.h"
+#include "tel.h"
 
 static int tilde_escape(char *s);
 
 /*
- * Read a telegram for RECIPIENT into BUF, in UTF-8.
- * BUF must have space for MAXTELSIZE+1 characters.
+ * Read a telegram for @recipient into @buf, in UTF-8.
+ * @buf must have space for MAXTELSIZE+1 characters.
  * Return telegram length, or -1 on error.
  */
 int
@@ -53,13 +53,14 @@ getele(char *recipient, char *buf)
     char left[16];
 
     pr("Enter telegram for %s\n", recipient);
-    pr("undo last line with ~u, print with ~p, abort with ~q, end with ^D or .\n");
+    pr("undo last line with ~u, print with ~p, abort with ~q, end with .\n");
     bp = buf;
-    while (!player->aborted) {
+    *bp = 0;
+    for (;;) {
        sprintf(left, "%4d left: ", (int)(buf + MAXTELSIZE - bp));
        if (uprmptrd(left, buffer, sizeof(buffer) - 2) <= 0)
            return -1;
-       switch(tilde_escape(buffer)) {
+       switch (tilde_escape(buffer)) {
        case 'q':
            return -1;
        case 'u':
@@ -92,13 +93,11 @@ getele(char *recipient, char *buf)
            bp += len;
        }
     }
-    if (player->aborted)
-       return -1;
     return bp - buf;
 }
 
 /*
- * If S is a `tilde escape', return its code, else 0.
+ * If @s is a `tilde escape', return its code, else 0.
  * A tilde escape is '~' followed by the code character.
  */
 static int