client: Unbreak standalone build

[empserver] / src / client / login.c

diff --git a/src/client/login.c b/src/client/login.c
index 58a32bbfaa5f7eb6f55eb1eb55c39984feea3be0..81b7d74d2a95eeabf2a2b05cc92e106f177a66c9 100644 (file)
--- a/src/client/login.c
+++ b/src/client/login.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-2021, 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,39 +14,36 @@
  *  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.
  *
  *  ---
  *
  *  login.c: Log into an empire server
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2020
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "proto.h"
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
+#include "misc.h"
+#include "proto.h"
 
 int
-login(int s, char *uname, char *cname, char *cpass, int kill_proc, int utf8)
+login(int s, char *uname, char *cname, char *cpass,
+      int kill_proc, int utf8)
 {
     char tmp[128];
     char buf[1024];
@@ -56,9 +53,11 @@ login(int s, char *uname, char *cname, char *cpass, int kill_proc, int utf8)
 
     if (!expect(s, C_INIT, buf))
        return 0;
-    (void)sendcmd(s, "user", uname);
-    if (!expect(s, C_CMDOK, buf))
+    sendcmd(s, "user", uname);
+    if (!expect(s, C_CMDOK, buf)) {
+       fprintf(stderr, "Server rejects your user name\n");
        return 0;
+    }
     if (utf8) {
        sendcmd(s, "options", "utf-8");
        for (;;) {
@@ -81,43 +80,31 @@ login(int s, char *uname, char *cname, char *cpass, int kill_proc, int utf8)
     len = strlen(cname);
     if (cname[len-1] == '\n')
        cname[len-1] = 0;
-    (void)sendcmd(s, "coun", cname);
+    sendcmd(s, "coun", cname);
     if (!expect(s, C_CMDOK, buf)) {
-       (void)fprintf(stderr, "empire: no such country\n");
+       (void)fprintf(stderr, "No such country\n");
        return 0;
     }
     if (cpass == NULL) {
-#ifndef _WIN32
-       cpass = getpass("Your name? ");
-       if (cpass == NULL || *cpass == 0)
-           return 0;
-#else
-       printf("Note: This is echoed to the screen\n");
-       printf("Your name? ");
-       fflush(stdout);
-       cpass = fgets(tmp, sizeof(tmp), stdin);
+       cpass = get_password("Your name? ");
        if (cpass == NULL || *cpass == 0)
            return 0;
-       len = strlen(cpass);
-       if (cname[len-1] == '\n')
-           cname[len-1] = 0;
-#endif
     }
     (void)printf("\n");
-    (void)sendcmd(s, "pass", cpass);
+    sendcmd(s, "pass", cpass);
     memset(cpass, 0, strlen(cpass));   /* for core dumps */
     if (!expect(s, C_CMDOK, buf)) {
        (void)fprintf(stderr, "Bad password\n");
        return 0;
     }
     if (kill_proc) {
-       (void)sendcmd(s, "kill", NULL);
+       sendcmd(s, "kill", NULL);
        (void)printf("\n\t-=O=-\n");
        (void)expect(s, C_EXIT, buf);
        fprintf(stderr, "%s\n", buf);
        return 0;
     }
-    (void)sendcmd(s, "play", NULL);
+    sendcmd(s, "play", NULL);
     (void)printf("\n\t-=O=-\n");
     if (!expect(s, C_INIT, buf)) {
        fprintf(stderr, "%s\n", buf);