new prefix_locked bits conditionalized to WIN32
This commit is contained in:
@@ -398,7 +398,9 @@ E const char *const monexplain[], invisexplain[], *const oclass_names[];
|
||||
#endif
|
||||
|
||||
E char *fqn_prefix[PREFIX_COUNT];
|
||||
#ifdef WIN32
|
||||
E boolean fqn_prefix_locked[PREFIX_COUNT];
|
||||
#endif
|
||||
#ifdef PREFIXES_IN_USE
|
||||
E char *fqn_prefix_names[PREFIX_COUNT];
|
||||
#endif
|
||||
|
||||
@@ -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 };
|
||||
#ifdef WIN32
|
||||
boolean fqn_prefix_locked[PREFIX_COUNT] = { FALSE, FALSE, FALSE,
|
||||
FALSE, FALSE, FALSE,
|
||||
FALSE, FALSE, FALSE,
|
||||
FALSE };
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef PREFIXES_IN_USE
|
||||
char *fqn_prefix_names[PREFIX_COUNT] = {
|
||||
"hackdir", "leveldir", "savedir", "bonesdir", "datadir",
|
||||
|
||||
@@ -2159,8 +2159,10 @@ int prefixid;
|
||||
|
||||
if (!bufp)
|
||||
return;
|
||||
#ifdef WIN32
|
||||
if (fqn_prefix_locked[prefixid])
|
||||
return;
|
||||
#endif
|
||||
/* Backward compatibility, ignore trailing ;n */
|
||||
if ((ptr = index(bufp, ';')) != 0)
|
||||
*ptr = '\0';
|
||||
@@ -3870,9 +3872,10 @@ assure_syscf_file()
|
||||
{
|
||||
int fd;
|
||||
|
||||
#ifdef WIN32
|
||||
/* We are checking that the sysconf exists ... lock the path */
|
||||
fqn_prefix_locked[SYSCONFPREFIX] = TRUE;
|
||||
|
||||
#endif
|
||||
/*
|
||||
* All we really care about is the end result - can we read the file?
|
||||
* So just check that directly.
|
||||
|
||||
Reference in New Issue
Block a user