Update copyright notice

[empserver] / src / lib / commands / chan.c

diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c
index fc36a4bb696ec978d5a1115e4753754dd12213e5..8df0b6f5631ef670d622270de0608a6d7cd8ca62 100644 (file)
--- a/src/lib/commands/chan.c
+++ b/src/lib/commands/chan.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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
@@ -26,38 +26,28 @@
  *  ---
  *
  *  chan.c: Change country/representative name
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 2000
  */
 
 #include <config.h>
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
+#include "commands.h"
 #include "news.h"
 #include "optlist.h"
-#include "commands.h"
 
 int
 chan(void)
 {
-    s_char *temp;
-    struct natstr *natp;
-    register s_char *p;
-    natid cn;
+    char *p;
     int charge;
-    int nonb;
     int btucost;
-    s_char buf[1024];
+    char buf[1024];
     struct natstr *us;
 
-    if ((p =
-        getstarg(player->argp[1], "country name or representative? ",
-                 buf)) == 0)
+    p = getstarg(player->argp[1], "country name or representative? ", buf);
+    if (!p)
        return RET_SYN;
     us = getnatp(player->cnum);
     if (us->nat_stat == STAT_VIS) {
@@ -85,28 +75,11 @@ chan(void)
                    charge = us->nat_money / 10;
            }
        }
-       if ((p =
-            getstarg(player->argp[2], "New country name -- ", buf)) == 0)
+       p = getstarg(player->argp[2], "New country name -- ", buf);
+       if (!p)
            return RET_SYN;
-       p[sizeof(us->nat_cnam) - 1] = 0;
-       for (cn = 0; NULL != (natp = getnatp(cn)); cn++) {
-           if (!strcmp(p, natp->nat_cnam)) {
-               pr("Country #%d is already called `%s'!\n", cn, p);
-               return RET_FAIL;
-           }
-       }
-       nonb = 0;
-       for (temp = p; *temp != '\0'; temp++) {
-           if (iscntrl(*temp)) {
-               pr("No control characters allowed in country names!\n");
-               return RET_FAIL;
-           } else if (*temp != ' ')
-               nonb = 1;
-       }
-       if (!nonb) {
-           pr("Must have a non-blank name!\n");
+       if (!check_nat_name(p))
            return RET_FAIL;
-       }
        player->dolcost += charge;
        player->btused += btucost;
        strcpy(us->nat_cnam, p);
@@ -116,8 +89,8 @@ chan(void)
     case 'p':
     case 'r':
        pr("(note: these are stored in plain text.)\n");
-       if ((p = getstarg(player->argp[2],
-                         "New representative name -- ", buf)) == 0)
+       p = getstarg(player->argp[2], "New representative name -- ", buf);
+       if (!p)
            return RET_SYN;
        p[sizeof(us->nat_pnam) - 1] = 0;
        strcpy(us->nat_pnam, p);