Update copyright notice.

[empserver] / src / lib / player / login.c

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 5b3dfcdb2ffdc304c1efbaa1bde5406382a881e6..2f10f31910d6d214552e19995a68afbf1ff0bb41 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -32,9 +32,7 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
 #include "prototypes.h"
 #include "misc.h"
 #include "proto.h"
@@ -58,7 +56,7 @@
 #endif
 #include <errno.h>
 
-struct cmndstr login_coms[];
+extern struct cmndstr login_coms[];
 
 
 /*ARGSUSED*/
@@ -66,8 +64,7 @@ void
 player_login(void *ud)
 {
     s_char buf[128];
-    s_char space[512];
-    s_char *av[64];
+    s_char space[128];
     int ac;
     int cmd;
 
@@ -81,13 +78,13 @@ player_login(void *ud)
            io_input(player->iop, IO_WAIT);
            continue;
        }
-       ac = parse(buf, av, 0, space, 0);
-       cmd = comtch(av[0], login_coms, 0, 0);
+       ac = parse(buf, player->argp, NULL, space, NULL);
+       cmd = comtch(player->argp[0], login_coms, 0, 0);
        if (cmd < 0) {
-           pr_id(player, C_BADCMD, "Command %s not found\n", av[0]);
+           pr_id(player, C_BADCMD, "Command %s not found\n", player->argp[0]);
            continue;
        }
-       switch (login_coms[cmd].c_addr(player, ac, av)) {
+       switch (login_coms[cmd].c_addr()) {
        case RET_OK:
            break;
        case RET_FAIL:
@@ -103,7 +100,7 @@ player_login(void *ud)
     }
     player->state = PS_SHUTDOWN;
     if (!io_eof(player->iop)) {
-       (void)pr_player(player, C_EXIT, "so long...\n");
+       pr_player(player, C_EXIT, "so long...\n");
        io_noblocking(player->iop, 0);
        while (io_output(player->iop, IO_WAIT) > 0) ;
     }
@@ -112,44 +109,44 @@ player_login(void *ud)
     /*NOTREACHED*/
 }
 
-int
-client_cmd(struct player *player, int ac, char **av)
+static int
+client_cmd(void)
 {
     int i;
 
-    if (ac < 1 || av[1] == '\0')
+    if (!player->argp[1])
        return RET_SYN;
 
-    for (i = 1; i < ac; ++i) {
+    for (i = 1; player->argp[i]; ++i) {
        if (i > 1)
-           (void)strncat(player->client, " ", sizeof(player->client) - 1);
-       (void)strncat(player->client, av[i], sizeof(player->client) - 1);
+           strncat(player->client, " ", sizeof(player->client) - 1);
+       strncat(player->client, player->argp[i], sizeof(player->client) - 1);
     }
     player->client[sizeof(player->client) - 1] = '\0';
     pr_id(player, C_CMDOK, "talking to %s\n", player->client);
     return RET_OK;
 }
 
-int
-user_cmd(struct player *player, int ac, char **av)
+static int
+user_cmd(void)
 {
-    if (ac < 1 || av[1] == '\0')
+    if (!player->argp[1])
        return RET_SYN;
-    (void)strncpy(player->userid, av[1], sizeof(player->userid) - 1);
+    strncpy(player->userid, player->argp[1], sizeof(player->userid) - 1);
     player->userid[sizeof(player->userid) - 1] = '\0';
     pr_id(player, C_CMDOK, "hello %s\n", player->userid);
     return RET_OK;
 }
 
-int
-sanc_cmd(struct player *player, int ac, char **av)
+static int
+sanc_cmd(void)
 {
     struct nstr_item ni;
     struct natstr nat;
     int first = 1;
 
     if (!opt_BLITZ) {
-       pr_id(player, C_BADCMD, "Command %s not found\n", av[0]);
+       pr_id(player, C_BADCMD, "Command %s not found\n", player->argp[0]);
        return RET_FAIL;
     }
 
@@ -171,36 +168,36 @@ sanc_cmd(struct player *player, int ac, char **av)
     return RET_OK;
 }
 
-int
-coun_cmd(struct player *player, int ac, char **av)
+static int
+coun_cmd(void)
 {
     natid cnum;
 
-    if (ac < 1 || av[1] == '\0')
+    if (!player->argp[1])
        return RET_SYN;
-    if (natbyname(av[1], &cnum) < 0) {
-       pr_id(player, C_CMDERR, "country %s does not exist\n", av[1]);
+    if (natbyname(player->argp[1], &cnum) < 0) {
+       pr_id(player, C_CMDERR, "country %s does not exist\n", player->argp[1]);
        return 0;
     }
     player->cnum = cnum;
     player->validated = 0;
-    pr_id(player, C_CMDOK, "country name %s\n", av[1]);
+    pr_id(player, C_CMDOK, "country name %s\n", player->argp[1]);
     return 0;
 }
 
-int
-pass_cmd(struct player *player, int ac, char **av)
+static int
+pass_cmd(void)
 {
-    if (ac < 1 || av[1] == '\0')
+    if (!player->argp[1])
        return RET_SYN;
     if (player->cnum == 255) {
        pr_id(player, C_CMDERR, "need country first\n");
        return RET_FAIL;
     }
-    if (!natpass(player->cnum, av[1])) {
+    if (!natpass(player->cnum, player->argp[1])) {
        pr_id(player, C_CMDERR, "password bad, logging entry\n");
        logerror("%s tried country #%d with %s",
-                praddr(player), player->cnum, av[1]);
+                praddr(player), player->cnum, player->argp[1]);
        return RET_FAIL;
     }
     player->validated++;
@@ -209,27 +206,31 @@ pass_cmd(struct player *player, int ac, char **av)
     return RET_OK;
 }
 
-/*ARGSUSED*/
-int
-play_cmd(struct player *player, int ac, char **av)
+static int
+play_cmd(void)
 {
-    extern char *banfil;
     struct player *other;
     natid cnum;
     struct natstr *natp;
+    char **ap;
 
-    if (ac == 4) {
-       (void)strncpy(player->userid, av[1], sizeof(player->userid) - 1);
+    ap = player->argp;
+    if (*++ap) {
+       strncpy(player->userid, *ap, sizeof(player->userid) - 1);
        player->userid[sizeof(player->userid) - 1] = '\0';
        player->validated = 0;
-       if (natbyname(av[2], &cnum) < 0) {
-           pr_id(player, C_CMDERR, "country %s does not exist\n", av[2]);
+    }
+    if (*++ap) {
+       if (natbyname(*ap, &cnum) < 0) {
+           pr_id(player, C_CMDERR, "country %s does not exist\n", *ap);
            return 0;
        }
-       if (!natpass(cnum, av[3])) {
+    }
+    if (*++ap) {
+       if (!natpass(cnum, *ap)) {
            pr_id(player, C_CMDERR, "password bad, logging entry\n");
            logerror("%s tried country #%d with %s",
-                    praddr(player), cnum, av[3]);
+                    praddr(player), cnum, *ap);
            return RET_FAIL;
        }
        player->cnum = cnum;
@@ -259,9 +260,8 @@ play_cmd(struct player *player, int ac, char **av)
     return RET_OK;
 }
 
-/*ARGSUSED*/
-int
-kill_cmd(struct player *player, int ac, char **av)
+static int
+kill_cmd(void)
 {
     struct player *other;
 
@@ -279,9 +279,8 @@ kill_cmd(struct player *player, int ac, char **av)
     return RET_OK;
 }
 
-/*ARGSUSED*/
-int
-list_cmd(struct player *player, int ac, char **av)
+static int
+list_cmd(void)
 {
     struct player *lp;
     int first = 1;
@@ -302,9 +301,8 @@ list_cmd(struct player *player, int ac, char **av)
     return 0;
 }
 
-/*ARGSUSED*/
-int
-quit_cmd(struct player *player, int ac, char **av)
+static int
+quit_cmd(void)
 {
     pr_id(player, C_EXIT, "so long\n");
     io_shutdown(player->iop, IO_READ);