more follow-up tweaking for missing sysconf --showpaths

This commit is contained in:
nhmall
2024-12-23 00:33:12 -05:00
parent 1a6847ca15
commit 9ba20d0e22
+10 -7
View File
@@ -4562,12 +4562,13 @@ debugcore(const char *filename, boolean wildcards)
#endif #endif
#endif #endif
#define SYSCONFFILE "system configuration file"
void void
reveal_paths(int code) reveal_paths(int code)
{ {
boolean skip_sysopt = FALSE; boolean skip_sysopt = FALSE;
const char *fqn, *nodumpreason, const char *fqn, *nodumpreason;
*sysconffile = "system configuration file";
char buf[BUFSZ]; char buf[BUFSZ];
#if defined(SYSCF) || !defined(UNIX) || defined(DLB) #if defined(SYSCF) || !defined(UNIX) || defined(DLB)
@@ -4602,8 +4603,8 @@ reveal_paths(int code)
#else #else
buf[0] = '\0'; buf[0] = '\0';
#endif #endif
raw_printf("%s %s%s:", raw_printf("%s %s%s:", s_suffix(gamename),
s_suffix(gamename), sysconffile, buf); SYSCONFFILE, buf);
#ifdef SYSCF_FILE #ifdef SYSCF_FILE
filep = SYSCF_FILE; filep = SYSCF_FILE;
#else #else
@@ -4617,7 +4618,7 @@ reveal_paths(int code)
raw_printf(" \"%s\"", filep); raw_printf(" \"%s\"", filep);
if (code == 1) { if (code == 1) {
raw_printf("NOTE: The %s above is missing or inaccessible!", raw_printf("NOTE: The %s above is missing or inaccessible!",
sysconffile); SYSCONFFILE);
skip_sysopt = TRUE; skip_sysopt = TRUE;
} }
#else /* !SYSCF */ #else /* !SYSCF */
@@ -4700,8 +4701,10 @@ reveal_paths(int code)
#ifdef SYSCF #ifdef SYSCF
if (!skip_sysopt) { if (!skip_sysopt) {
fqn = sysopt.dumplogfile; fqn = sysopt.dumplogfile;
if (!fqn)
nodumpreason = "DUMPLOGFILE is not set in " SYSCONFFILE;
} else { } else {
nodumpreason = "dumplogfile setting unavailable from missing sysconf"; nodumpreason = SYSCONFFILE " is missing; no DUMPLOGFILE setting";
} }
#else /* !SYSCF */ #else /* !SYSCF */
#ifdef DUMPLOG_FILE #ifdef DUMPLOG_FILE
@@ -4714,7 +4717,7 @@ reveal_paths(int code)
buf[sizeof buf - sizeof " \"\""] = '\0'; buf[sizeof buf - sizeof " \"\""] = '\0';
raw_printf(" \"%s\"", buf); raw_printf(" \"%s\"", buf);
} else { } else {
raw_printf("No end-of-game disclosure file (%s)", nodumpreason); raw_printf("No end-of-game disclosure file (%s).", nodumpreason);
} }
#endif /* ?DUMPLOG */ #endif /* ?DUMPLOG */