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

Make econfig keys data and info work for relative names

Browse source 
File names in econfig need to be interpreted relative to configdir.
This wasn't the case everywhere for keys data and info.

Fix this by changing variables gamedir and infodir to hold absolute
names.  Change builtindir likewise, for consistency.  Store the values
from econfig in gamedir_conf, infodir_conf and builtindir_conf.

Uses new fnameat() to derive absolute names from possibly relative
ones.
This commit is contained in:
Markus Armbruster 2008-02-03 20:51:38 +01:00
parent 7379041d26
commit 4bb23dd1a6
6 changed files with 95 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/econfig-spec.h
View file

@ -73,17 +73,13 @@ EMPCFBOTH((fvname), (vname), int, NSC_INT, KM_OPTION, (descr))
EMPCF_COMMENT("\n### Server configuration and information")
EMPCFBOTH("custom_tables", custom_tables, char *, NSC_STRING, KM_INTERNAL,
"Custom configuration table files, separated by space")
EMPCFBOTH("data", gamedir, char *, NSC_STRING, KM_INTERNAL,
EMPCFBOTH("data", gamedir_conf, char *, NSC_STRING, KM_INTERNAL,
"Directory where this game's data is stored")
EMPCF_COMMENT("# Note: Use an absolute name here, the interpretation of a relative\n"
"# name may change.")
EMPCFBOTH("info", infodir, char *, NSC_STRING, KM_INTERNAL,
EMPCFBOTH("info", infodir_conf, char *, NSC_STRING, KM_INTERNAL,
"Directory where info pages are stored, can be shared among games")
EMPCF_COMMENT("# Set this to your build tree's info.nr to run the server without\n"
"# installing it.\n"
"# Note: Use an absolute name here, the interpretation of a relative\n"
"# name may change.")
EMPCFBOTH("builtin", builtindir, char *, NSC_STRING, KM_INTERNAL,
"# installing it.")
EMPCFBOTH("builtin", builtindir_conf, char *, NSC_STRING, KM_INTERNAL,
"Directory where builtin files are stored")
EMPCF_COMMENT("# Set this to your source tree's src/lib/global to run the server\n"
"# without installing it, else leave it alone.")