COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / gen / getstring.c

diff --git a/src/lib/gen/getstring.c b/src/lib/gen/getstring.c
index f1b7e65d583325f2022cbeeeb72312a23fd8b478..7015d156cf29cb259d65687034147a19a3c09411 100644 (file)
--- a/src/lib/gen/getstring.c
+++ b/src/lib/gen/getstring.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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,15 +31,34 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "gen.h"
 #include "subs.h"
 
-s_char *
-getstring(s_char *prompt, s_char *buf)
+/*
+ * Print sub-prompt PROMPT, receive a line of input into BUF[1024].
+ * Return BUF on success, else NULL.
+ */
+char *
+getstring(char *prompt, char *buf)
 {
     *buf = '\0';
     if (prmptrd(prompt, buf, 1024) < 0)
-       return 0;
+       return NULL;
+    return buf;
+}
+
+/*
+ * Print sub-prompt PROMPT, receive a line of UTF-8 input into BUF[1024].
+ * Return BUF on success, else NULL.
+ */
+char *
+ugetstring(char *prompt, char *buf)
+{
+    *buf = '\0';
+    if (uprmptrd(prompt, buf, 1024) < 0)
+       return NULL;
     return buf;
 }