From fbd10e4b0e3e469336055c13a889d4a7dab82132 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 18 Nov 2019 15:12:38 -0500
Subject: [PATCH] some further refinements to --showpaths

The Windows data file path has to be constructed because
Windows defines VERSION_IN_DLB_FILENAME.

Keep the personal configuration file details as the last
information displayed.
---
 src/files.c | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/files.c b/src/files.c
index a9bee528a..61612e20f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -4097,6 +4097,14 @@ reveal_paths(VOID_ARGS)
 #ifdef DLB
     raw_printf("Basic data files%s are collected inside:", buf);
     filep = DLBFILE;
+#ifdef VERSION_IN_DLB_FILENAME
+    Strcpy(buf, build_dlb_filename((const char *) 0));
+#ifdef PREFIXES_IN_USE
+    fqn = fqname(buf, DATAPREFIX, 1);
+    if (fqn)
+        filep = fqn;
+#endif /* PREFIXES_IN_USE */
+#endif
     raw_printf("    \"%s\"", filep);
 #ifdef DLBFILE2
     filep = DLBFILE2;
@@ -4106,6 +4114,27 @@ reveal_paths(VOID_ARGS)
     raw_printf("Basic data files%s are in many separate files.", buf);
 #endif /* ?DLB */
 
+    /* dumplog */
+
+#ifdef DUMPLOG
+#ifdef SYSCF
+    fqn = sysopt.dumplogfile;
+#else  /* !SYSCF */
+#ifdef DUMPLOG_FILE
+    fqn = DUMPLOG_FILE;
+#else
+    fqn = (char *) 0;
+#endif
+#endif /* ?SYSCF */
+    if (fqn) {
+        raw_print("Your end-of-game dump file:");
+        (void) dump_fmtstr(fqn, buf, FALSE);
+        buf[sizeof buf - sizeof "    \"\""] = '\0';
+        raw_printf("    \"%s\"", buf);
+    } else
+#endif /* DUMPLOG */
+        raw_print("No end-of-game dump file.");
+
     /* personal configuration file */
 
     buf[0] = '\0';
@@ -4158,25 +4187,6 @@ reveal_paths(VOID_ARGS)
     raw_printf("    \"%s\"", fqn ? fqn : default_configfile);
 #endif  /* ?UNIX */
 
-#ifdef DUMPLOG
-#ifdef SYSCF
-    fqn = sysopt.dumplogfile;
-#else  /* !SYSCF */
-#ifdef DUMPLOG_FILE
-    fqn = DUMPLOG_FILE;
-#else
-    fqn = (char *) 0;
-#endif
-#endif /* ?SYSCF */
-    if (fqn) {
-        raw_print("Your end-of-game dump file:");
-        (void) dump_fmtstr(fqn, buf, FALSE);
-        buf[sizeof buf - sizeof "    \"\""] = '\0';
-        raw_printf("    \"%s\"", buf);
-    } else
-#endif /* DUMPLOG */
-        raw_print("No end-of-game dump file.");
-
     raw_print("");
 }