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

new prefix_locked bits conditionalized to WIN32

Browse Source
This commit is contained in:
nhmall
2019-11-11 11:46:49 -05:00
parent bc69fc65d2
commit 91b4bd0da9
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/decl.h
View File

@@ -398,7 +398,9 @@ E const char *const monexplain[], invisexplain[], *const oclass_names[];
#endif #endif
E char *fqn_prefix[PREFIX_COUNT]; E char *fqn_prefix[PREFIX_COUNT];
#ifdef WIN32
E boolean fqn_prefix_locked[PREFIX_COUNT]; E boolean fqn_prefix_locked[PREFIX_COUNT];
#endif
#ifdef PREFIXES_IN_USE #ifdef PREFIXES_IN_USE
E char *fqn_prefix_names[PREFIX_COUNT]; E char *fqn_prefix_names[PREFIX_COUNT];
#endif #endif

4
src/decl.c
View File

@@ -286,11 +286,13 @@ 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, (char *) 0, (char *) 0, (char *) 0, (char *) 0, (char *) 0,
(char *) 0 }; (char *) 0 };
#ifdef WIN32
boolean fqn_prefix_locked[PREFIX_COUNT] = { FALSE, FALSE, FALSE, boolean fqn_prefix_locked[PREFIX_COUNT] = { FALSE, FALSE, FALSE,
FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
FALSE }; FALSE };
#endif
#ifdef PREFIXES_IN_USE #ifdef PREFIXES_IN_USE
char *fqn_prefix_names[PREFIX_COUNT] = { char *fqn_prefix_names[PREFIX_COUNT] = {
"hackdir", "leveldir", "savedir", "bonesdir", "datadir", "hackdir", "leveldir", "savedir", "bonesdir", "datadir",

5
src/files.c
View File

@@ -2159,8 +2159,10 @@ int prefixid;
if (!bufp) if (!bufp)
return; return;
#ifdef WIN32
if (fqn_prefix_locked[prefixid]) if (fqn_prefix_locked[prefixid])
return; return;
#endif
/* Backward compatibility, ignore trailing ;n */ /* Backward compatibility, ignore trailing ;n */
if ((ptr = index(bufp, ';')) != 0) if ((ptr = index(bufp, ';')) != 0)
*ptr = '\0'; *ptr = '\0';
@@ -3870,9 +3872,10 @@ assure_syscf_file()
{ {
int fd; int fd;
#ifdef WIN32
/* We are checking that the sysconf exists ... lock the path */ /* We are checking that the sysconf exists ... lock the path */
fqn_prefix_locked[SYSCONFPREFIX] = TRUE; fqn_prefix_locked[SYSCONFPREFIX] = TRUE;
#endif
/* /*
* All we really care about is the end result - can we read the file? * All we really care about is the end result - can we read the file?
* So just check that directly. * So just check that directly.