From 1301e3bd764fb771d1d0af21e570751be874892f Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 17 Nov 2019 16:45:10 -0800 Subject: [PATCH] '--showpaths' dlb vs non-dlbb Have the --showpaths feedback mention whether dlb is in use or not, and show the container file name(s) when it is. Users of prebuilt binaries or who build with a hints file instead of picking and choosing things in config.h might not know, and vms (if it ever catches up with --showpaths) uses a different container name from everybody else ("nh-data.dlb" instead of "nhdat"). --- src/files.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/files.c b/src/files.c index 5a0e1a7b2..a9bee528a 100644 --- a/src/files.c +++ b/src/files.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 files.c $NHDT-Date: 1573869063 2019/11/16 01:51:03 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.269 $ */ +/* NetHack 3.6 files.c $NHDT-Date: 1574037901 2019/11/18 00:45:01 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.270 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2598,8 +2598,8 @@ char *origbuf; #endif /* SYSCF */ } else if (match_varname(buf, "BOULDER", 3)) { - (void) get_uchars(bufp, &ov_primary_syms[SYM_BOULDER + SYM_OFF_X], TRUE, 1, - "BOULDER"); + (void) get_uchars(bufp, &ov_primary_syms[SYM_BOULDER + SYM_OFF_X], + TRUE, 1, "BOULDER"); } else if (match_varname(buf, "MENUCOLOR", 9)) { if (!add_menu_coloring(bufp)) retval = FALSE; @@ -4062,13 +4062,13 @@ reveal_paths(VOID_ARGS) if (strp && (int) strlen(strp) < maxlen) Sprintf(buf, " (in %s)", strp); #endif /* PREFIXES_IN_USE */ - raw_printf("%s loadable symbols file%s:", s_suffix(gamename), buf); + raw_printf("The loadable symbols file%s:", buf); #endif /* UNIX */ #ifdef UNIX envp = getcwd(cwdbuf, PATH_MAX); if (envp) { - raw_printf("%s loadable symbols file:", s_suffix(gamename)); + raw_print("The loadable symbols file:"); raw_printf(" \"%s/%s\"", envp, SYMBOLS); } #else /* UNIX */ @@ -4085,6 +4085,27 @@ reveal_paths(VOID_ARGS) raw_printf(" \"%s\"", filep); #endif /* UNIX */ + /* dlb vs non-dlb */ + + buf[0] = '\0'; +#ifdef PREFIXES_IN_USE + strp = fqn_prefix_names[DATAPREFIX]; + maxlen = BUFSZ - sizeof " (in )"; + if (strp && (int) strlen(strp) < maxlen) + Sprintf(buf, " (in %s)", strp); +#endif +#ifdef DLB + raw_printf("Basic data files%s are collected inside:", buf); + filep = DLBFILE; + raw_printf(" \"%s\"", filep); +#ifdef DLBFILE2 + filep = DLBFILE2; + raw_printf(" \"%s\"", filep); +#endif +#else /* !DLB */ + raw_printf("Basic data files%s are in many separate files.", buf); +#endif /* ?DLB */ + /* personal configuration file */ buf[0] = '\0'; -- 2.40.0