Update copyright notice

[empserver] / src / lib / common / conftab.c

diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c
index c9f9216d7c4645f8ea51e3f097eec09b9606871d..fe97daddde270c10952dd15c3fc66c12cd3a7364 100644 (file)
--- a/src/lib/common/conftab.c
+++ b/src/lib/common/conftab.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-2020, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,42 +25,50 @@
  *  ---
  *
  *  conftab.c: Load game configuration files
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006
- *  
+ *     Markus Armbruster, 2006-2010
  */
 
 #include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
-#include <time.h>
-
-#include "prototypes.h"
-#include "optlist.h"
 #include "file.h"
+#include "fnameat.h"
+#include "optlist.h"
+#include "prototypes.h"
+#include "xdump.h"
 
-static int read_config_table_file(char *);
+static int read_custom_table_file(char *);
 
+/*
+ * Read builtin configuration tables.
+ * Return 0 on success, -1 on failure.
+ */
 int
 read_builtin_tables(void)
 {
     struct empfile *ep;
     FILE *fp;
-    int res;
-    
+    int lineno, res;
+
+    /*
+     * Need to read config files for tables referenced through
+     * ep->cadef[].ca_table before those for ep.  empfile[] is ordered
+     * that way.
+     */
     for (ep = empfile; ep->name; ep++) {
        if (!EF_IS_GAME_STATE(ep->uid) && ep->file) {
-           if ((fp = fopen(ep->file, "r")) == NULL) {
+           if ((fp = fopenat(ep->file, "r", builtindir)) == NULL) {
                fprintf(stderr, "Can't open %s for reading (%s)\n",
                        ep->file, strerror(errno));
                return -1;
            }
-           res = xundump(fp, ep->file, ep->uid);
+           lineno = 1;
+           res = xundump(fp, ep->file, &lineno, ep->uid);
            if (res >= 0 && getc(fp) != EOF) {
-               fprintf(stderr, "%s: Junk after the table\n",
-                       ep->file);
+               fprintf(stderr, "%s: Junk after the table\n", ep->file);
                res = EF_BAD;
            }
            fclose(fp);
@@ -78,14 +85,14 @@ read_builtin_tables(void)
  * Return 0 on success, -1 on failure.
  */
 int
-read_config_tables(void)
+read_custom_tables(void)
 {
-    char *tmp = strdup(config_tables);
+    char *tmp = strdup(custom_tables);
     char *fname;
     int res = 0;
 
     for (fname = strtok(tmp, " \t"); fname; fname = strtok(NULL, " \t")) {
-       if (read_config_table_file(fname) < 0)
+       if (read_custom_table_file(fname) < 0)
            res = -1;
     }
 
@@ -94,22 +101,24 @@ read_config_tables(void)
 }
 
 /*
- * Read configuaration table file FNAME.
+ * Read configuration table file @fname.
  * Return 0 on success, -1 on error.
  */
 static int
-read_config_table_file(char *fname)
+read_custom_table_file(char *fname)
 {
-    int res, n;
+    int lineno, res, n;
     FILE *fp;
 
-    if (!(fp = fopen(fname, "r"))) {
+    if (!(fp = fopenat(fname, "r", configdir))) {
        fprintf(stderr, "Can't open config table %s for reading (%s)\n",
                fname, strerror(errno));
        return -1;
     }
 
-    for (n = 0; (res = xundump(fp, fname, EF_BAD)) >= 0; n++) ;
+    lineno = 1;
+    for (n = 0; (res = xundump(fp, fname, &lineno, EF_BAD)) >= 0; n++)
+       empfile[res].flags |= EFF_CUSTOM;
     if (res != EF_BAD && n == 0)
        fprintf(stderr, "Warning: configuration file %s is empty\n", fname);