Update copyright notice

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

diff --git a/src/lib/subs/askyn.c b/src/lib/subs/askyn.c
index f4ed15cbf0ddf8adce8aa2c4ba14792ca93b5a07..9956190cb2667ac41f33eb5cc18f837d20c4421b 100644 (file)
--- a/src/lib/subs/askyn.c
+++ b/src/lib/subs/askyn.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,45 +19,38 @@
  *
  *  ---
  *
- *  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    c;
+    char y_or_n[1024];
+    char c;
 
-       if (getstring(promptstring, y_or_n) == 0)
-               return 0;
-       c = *y_or_n;
-       if (c == 'y' || c == 'Y')
-               return 1;
+    if (!getstring(promptstring, y_or_n))
        return 0;
+    c = *y_or_n;
+    if (c == 'y' || c == 'Y')
+       return 1;
+    return 0;
 }
 
 /*
@@ -65,19 +58,19 @@ 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    c;
+    char y_or_n[1024];
+    char c;
 
-       while (getstring(promptstring, y_or_n)) {
-               c = *y_or_n;
-               if (c == 'y' || c == 'Y')
-                       return 1;
-               if (c == 'n' || c == 'N')
-                       return 0;
-               pr("You must answer either yes or no!\n");
-       }
-       /* assume no if aborted */
-       return 0;
+    while (getstring(promptstring, y_or_n)) {
+       c = *y_or_n;
+       if (c == 'y' || c == 'Y')
+           return 1;
+       if (c == 'n' || c == 'N')
+           return 0;
+       pr("You must answer either yes or no!\n");
+    }
+    /* assume no if aborted */
+    return 0;
 }