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

follow-up tweaking for missing sysconf --showpaths

Browse Source
This commit is contained in:
nhmall
2024-12-23 00:16:52 -05:00
parent 1746f57f37
commit 1a6847ca15
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files.c
+21 -13
View File
@@ -4565,6 +4565,7 @@ debugcore(const char *filename, boolean wildcards)
void void
reveal_paths(int code) reveal_paths(int code)
{ {
boolean skip_sysopt = FALSE;
const char *fqn, *nodumpreason, const char *fqn, *nodumpreason,
*sysconffile = "system configuration file"; *sysconffile = "system configuration file";
@@ -4617,6 +4618,7 @@ reveal_paths(int code)
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;
} }
#else /* !SYSCF */ #else /* !SYSCF */
raw_printf("No system configuration file."); raw_printf("No system configuration file.");
@@ -4690,17 +4692,20 @@ reveal_paths(int code)
/* dumplog */ /* dumplog */
fqn = (char *) 0;
#ifndef DUMPLOG #ifndef DUMPLOG
nodumpreason = "not supported"; nodumpreason = "not supported";
#else #else
nodumpreason = "disabled"; nodumpreason = "disabled";
#ifdef SYSCF #ifdef SYSCF
fqn = sysopt.dumplogfile; if (!skip_sysopt) {
fqn = sysopt.dumplogfile;
} else {
nodumpreason = "dumplogfile setting unavailable from missing sysconf";
}
#else /* !SYSCF */ #else /* !SYSCF */
#ifdef DUMPLOG_FILE #ifdef DUMPLOG_FILE
fqn = DUMPLOG_FILE; fqn = DUMPLOG_FILE;
#else
fqn = (char *) 0;
#endif #endif
#endif /* ?SYSCF */ #endif /* ?SYSCF */
if (fqn && *fqn) { if (fqn && *fqn) {
@@ -4708,20 +4713,23 @@ reveal_paths(int code)
(void) dump_fmtstr(fqn, buf, FALSE); (void) dump_fmtstr(fqn, buf, FALSE);
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);
}
#endif /* ?DUMPLOG */ #endif /* ?DUMPLOG */
raw_printf("No end-of-game disclosure file (%s).", nodumpreason);
#ifdef WIN32 #ifdef WIN32
if (sysopt.portable_device_paths) { if (!skip_sysopt) {
const char *pd = get_portable_device(); if (sysopt.portable_device_paths) {
const char *pd = get_portable_device();
/* an empty value for pd indicates that portable_device_paths /* an empty value for pd indicates that portable_device_paths
got set TRUE in a sysconf file other than the one containing got set TRUE in a sysconf file other than the one containing
the executable; disregard it */ the executable; disregard it */
if (strlen(pd) > 0) { if (strlen(pd) > 0) {
raw_printf("portable_device_paths (set in sysconf):"); raw_printf("portable_device_paths (set in sysconf):");
raw_printf(" \"%s\"", pd); raw_printf(" \"%s\"", pd);
}
} }
} }
#endif #endif