License upgrade to GPL version 3 or later

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

diff --git a/src/lib/subs/askyn.c b/src/lib/subs/askyn.c
index 0f654947f7137e2d6b51ac4284f69076a25569ea..a43ed8cbec8a002ff7da2b7f97219b554e090813 100644 (file)
--- a/src/lib/subs/askyn.c
+++ b/src/lib/subs/askyn.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,45 +14,37 @@
  *  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.
  *
  *  ---
  *
  *  askyn.c: The oldest routines in the book... ask questions of the user
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak, 1993
  *     Doug Hay, 1998
  */
 
-#include "misc.h"
-#include <fcntl.h>
-#if !defined(_WIN32)
-#include <sys/uio.h>
-#endif
-#include "nat.h"
-#include "tel.h"
-#include "file.h"
-#include "var.h"
+#include <config.h>
+
 #include "prototypes.h"
 
 /*
  * If they don't answer 'y' or 'Y', return 0
  */
 int
-confirm(s_char *promptstring)
+confirm(char *promptstring)
 {
-    s_char y_or_n[1024];
+    char y_or_n[1024];
     char c;
 
-    if (getstring(promptstring, y_or_n) == 0)
+    if (!getstring(promptstring, y_or_n))
        return 0;
     c = *y_or_n;
     if (c == 'y' || c == 'Y')
@@ -65,9 +57,9 @@ confirm(s_char *promptstring)
  * return 1 for y or Y, and 0 for n or N
  */
 int
-askyn(s_char *promptstring)
+askyn(char *promptstring)
 {
-    s_char y_or_n[1024];
+    char y_or_n[1024];
     char c;
 
     while (getstring(promptstring, y_or_n)) {