empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New way to read configuration tables:

Browse source 
(config_tables): New econfig key.
(read_config_tables): New, implements config_tables.
(main): Call it.  Need to call ef_init() and chdir(configdir) first.
(ef_init_srv): Don't call ef_init(), since main() did it already.

Remove old way to do the same:
(ef_load): Remove, along with calls.
(empfile): Set configuration tables' member file back to NULL.
This commit is contained in:
Markus Armbruster 2006-02-18 13:57:52 +00:00
parent e4865d473e
commit bd65a84eb5
8 changed files with 68 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/lib/common/ef_load.c → src/lib/common/conftab.c
View file

@ -25,45 +25,65 @@
*
* ---
*
* ef_load.c: Load custom game configuration files
* conftab.c: Load game configuration files
*
* Known contributors to this file:
* Ron Koenderink, 2005
* Markus Armbruster, 2006
*
*/
#include <config.h>
#include <errno.h>
#include <stdio.h>
#include <time.h>
#include "prototypes.h"
#include "optlist.h"
#include "file.h"
static int read_config_table_file(char *);
/*
* Read user configuration tables.
* Return 0 on success, -1 on failure.
*/
int
ef_load()
read_config_tables(void)
{
struct empfile *ep;
FILE *fp;
int retval = 0;
for (ep = empfile; ep->name; ep++) {
if (!EF_IS_GAME_STATE(ep->uid) && ep->file) {
if ((fp = fopen(ep->file, "r")) == NULL) {
continue;
}
if (xundump(fp, ep->name, ep->uid) < 0)
retval = -1;
else {
int ch = getc(fp);
if (ch != EOF) {
fprintf(stderr, "%s: Junk after the table\n",
ep->file);
retval = -1;
}
}
fclose(fp);
}
char *tmp = strdup(config_tables);
char *fname;
int res = 0;
for (fname = strtok(tmp, " \t"); fname; fname = strtok(NULL, " \t")) {
if (read_config_table_file(fname) < 0)
res = -1;
}
return retval;
free(tmp);
return res;
}
/*
* Read configuaration table file FNAME.
* Return 0 on success, -1 on error.
*/
static int
read_config_table_file(char *fname)
{
int res, n;
FILE *fp;
if (!(fp = fopen(fname, "r"))) {
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++) ;
if (res != EF_BAD && n == 0)
fprintf(stderr, "Warning: configuration file %s is empty\n", fname);
fclose(fp);
return -(res == EF_BAD);
}