nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

More tweaks to how windows deals with directory paths.

Browse Source
This commit is contained in:
Bart House
2019-11-03 13:31:17 -08:00
parent 0b23cac8ab
commit f0707fee6e
4 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decl.c
View File

@@ -286,6 +286,10 @@ char *fqn_prefix[PREFIX_COUNT] = { (char *) 0, (char *) 0, (char *) 0,
(char *) 0, (char *) 0, (char *) 0,
(char *) 0, (char *) 0, (char *) 0,
(char *) 0 };
boolean fqn_prefix_locked[PREFIX_COUNT] = { FALSE, FALSE, FALSE,
FALSE, FALSE, FALSE,
FALSE, FALSE, FALSE,
FALSE };
#ifdef PREFIXES_IN_USE
char *fqn_prefix_names[PREFIX_COUNT] = {

7
src/files.c
View File

@@ -2158,6 +2158,8 @@ int prefixid;
if (!bufp)
return;
if (fqn_prefix_locked[prefixid])
return;
/* Backward compatibility, ignore trailing ;n */
if ((ptr = index(bufp, ';')) != 0)
*ptr = '\0';
@@ -3196,7 +3198,7 @@ fopen_sym_file()
{
FILE *fp;
fp = fopen_datafile(SYMBOLS, "r", HACKPREFIX);
fp = fopen_datafile(SYMBOLS, "r", CONFIGPREFIX);
return fp;
}
@@ -3861,6 +3863,9 @@ assure_syscf_file()
{
int fd;
/* We are checking that the sysconf exists ... lock the path */
fqn_prefix_locked[SYSCONFPREFIX] = TRUE;
/*
* All we really care about is the end result - can we read the file?
* So just check that directly.