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

(datadir, edatadir, gamedir): Rename to avoid confusion with Autoconf

Browse source 
output variable datadir and with configuration data.
This commit is contained in:
Markus Armbruster 2006-02-18 09:16:50 +00:00
parent 58f67c8e19
commit 5282f500b5
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/global/path.c.in
View file

@ -39,7 +39,7 @@
char dflt_econfig[] = "@econfig@";
char *infodir = "@einfodir@";
char *datadir = "@edatadir@";
char *gamedir = "@gamedir@";
/* relative to DATADIR */
char *teldir = "tel";

4
src/server/main.c
View file

@ -202,8 +202,8 @@ main(int argc, char **argv)
if (emp_config(config_file) < 0)
exit(EXIT_FAILURE);
if (chdir(datadir)) {
fprintf(stderr, "Can't chdir to %s (%s)\n", datadir, strerror(errno));
if (chdir(gamedir)) {
fprintf(stderr, "Can't chdir to %s (%s)\n", gamedir, strerror(errno));
exit(EXIT_FAILURE);
}

4
src/util/fairland.c
View file

@ -435,8 +435,8 @@ allocate_memory(void)
int i;
char *fname;
fname = malloc(strlen(datadir) + 1 + strlen(empfile[EF_SECTOR].file) + 1);
sprintf(fname, "%s/%s", datadir, empfile[EF_SECTOR].file);
fname = malloc(strlen(gamedir) + 1 + strlen(empfile[EF_SECTOR].file) + 1);
sprintf(fname, "%s/%s", gamedir, empfile[EF_SECTOR].file);
sect_fptr = fopen(fname, "wb");
if (sect_fptr == NULL) {
perror(fname);

12
src/util/files.c
View file

@ -119,19 +119,19 @@ main(int argc, char *argv[])
ef_init();
if (access(datadir, F_OK) < 0 && mkdir(datadir, 0750) < 0) {
perror(datadir);
if (access(gamedir, F_OK) < 0 && mkdir(gamedir, 0750) < 0) {
perror(gamedir);
printf("Can't make game directory\n");
exit(1);
}
if (chdir(datadir)) {
fprintf(stderr, "Can't chdir to %s (%s)\n", datadir, strerror(errno));
if (chdir(gamedir)) {
fprintf(stderr, "Can't chdir to %s (%s)\n", gamedir, strerror(errno));
exit(EXIT_FAILURE);
}
if (!force) {
printf("WARNING: this blasts the existing game in %s (if any)\n",
datadir);
gamedir);
printf("continue? ");
fgets(buf, sizeof(buf), stdin);
if (*buf != 'y' && *buf != 'Y')
@ -188,7 +188,7 @@ main(int argc, char *argv[])
close(creat(timestampfil, 0600));
close(creat(annfil, 0600));
chmod(infodir, 0750);
chmod(datadir, 0770);
chmod(gamedir, 0770);
chmod(teldir, 0770);
/* create a zero-filled sector file */