more follow-up tweaking for missing sysconf --showpaths
This commit is contained in:
17
src/files.c
17
src/files.c
@@ -4562,12 +4562,13 @@ debugcore(const char *filename, boolean wildcards)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define SYSCONFFILE "system configuration file"
|
||||
|
||||
void
|
||||
reveal_paths(int code)
|
||||
{
|
||||
boolean skip_sysopt = FALSE;
|
||||
const char *fqn, *nodumpreason,
|
||||
*sysconffile = "system configuration file";
|
||||
const char *fqn, *nodumpreason;
|
||||
|
||||
char buf[BUFSZ];
|
||||
#if defined(SYSCF) || !defined(UNIX) || defined(DLB)
|
||||
@@ -4602,8 +4603,8 @@ reveal_paths(int code)
|
||||
#else
|
||||
buf[0] = '\0';
|
||||
#endif
|
||||
raw_printf("%s %s%s:",
|
||||
s_suffix(gamename), sysconffile, buf);
|
||||
raw_printf("%s %s%s:", s_suffix(gamename),
|
||||
SYSCONFFILE, buf);
|
||||
#ifdef SYSCF_FILE
|
||||
filep = SYSCF_FILE;
|
||||
#else
|
||||
@@ -4617,7 +4618,7 @@ reveal_paths(int code)
|
||||
raw_printf(" \"%s\"", filep);
|
||||
if (code == 1) {
|
||||
raw_printf("NOTE: The %s above is missing or inaccessible!",
|
||||
sysconffile);
|
||||
SYSCONFFILE);
|
||||
skip_sysopt = TRUE;
|
||||
}
|
||||
#else /* !SYSCF */
|
||||
@@ -4700,8 +4701,10 @@ reveal_paths(int code)
|
||||
#ifdef SYSCF
|
||||
if (!skip_sysopt) {
|
||||
fqn = sysopt.dumplogfile;
|
||||
if (!fqn)
|
||||
nodumpreason = "DUMPLOGFILE is not set in " SYSCONFFILE;
|
||||
} else {
|
||||
nodumpreason = "dumplogfile setting unavailable from missing sysconf";
|
||||
nodumpreason = SYSCONFFILE " is missing; no DUMPLOGFILE setting";
|
||||
}
|
||||
#else /* !SYSCF */
|
||||
#ifdef DUMPLOG_FILE
|
||||
@@ -4714,7 +4717,7 @@ reveal_paths(int code)
|
||||
buf[sizeof buf - sizeof " \"\""] = '\0';
|
||||
raw_printf(" \"%s\"", buf);
|
||||
} else {
|
||||
raw_printf("No end-of-game disclosure file (%s)", nodumpreason);
|
||||
raw_printf("No end-of-game disclosure file (%s).", nodumpreason);
|
||||
}
|
||||
#endif /* ?DUMPLOG */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user