Update copyright notice

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

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 301eac0d4a8baef275a8696c41740514127e11e8..d6a57aa51e3aa761e6a521ad16fe5234297b243a 100644 (file)
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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,33 +14,33 @@
  *  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.
  *
  *  ---
  *
  *  natarg.c: Return countr # given country name or country #
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
 
 #include <ctype.h>
+#include <stdlib.h>
+#include "file.h"
+#include "match.h"
 #include "misc.h"
 #include "nat.h"
+#include "optlist.h"
 #include "player.h"
-#include "file.h"
-#include "match.h"
 #include "prototypes.h"
-#include "optlist.h"
 
 /*
  * Get nation argument.
@@ -58,7 +58,7 @@ natargp(char *arg, char *prompt)
     struct natstr *np;
 
     arg = getstarg(arg, prompt, buf);
-    if (arg == 0 || *arg == 0)
+    if (!arg || !*arg)
        return NULL;
     if (isdigit(*arg))
        n = atoi(arg);
@@ -70,7 +70,7 @@ natargp(char *arg, char *prompt)
        }
     }
     np = getnatp(n);
-    if (!np) {
+    if (!np || np->nat_stat == STAT_UNUSED) {
        pr("Country '%s' doesn't exist.\n", arg);
        return NULL;
     }