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

use to "feature" in DEBUGFILES

Browse Source 
The code to lookup a value in DEBUGFILES usually operates on a file
name, but there are few non-file uses.  The latter wouldn't work on
VMS because of the way it was manipulating the name:  first stripping
away path, suffix, and version, then adding hardcoded ".c" suffix on.

I thought we already had a routine to get the base part of a name
from a full path, but if so, I haven't been able to find it.  This
adds new nh_basename() to do that, with the option of either keeping
or discarding the suffix or type portion.

The VMS usage that prompted this hasn't actually been tested.
This commit is contained in:
PatR
2023-05-25 15:35:49 -07:00
parent 2876b6e8fd
commit cf8a49cae6
4 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sys/vms/vmsfiles.c
View File

@@ -305,10 +305,10 @@ static char base_name[NAM$C_MAXRSS + 1];
/* return a copy of the 'base' portion of a filename */
char *
vms_basename(const char *name)
vms_basename(const char *name, boolean keep_suffix)
{
unsigned len;
char *base, *base_p;
char *base, *base_p, *xtra_p;
register const char *name_p;
/* skip directory/path */
@@ -323,10 +323,14 @@ vms_basename(const char *name)
if (!*name)
name = "."; /* this should never happen */
/* find extension/version and derive length of basename */
if ((name_p = strchr(name, '.')) == 0 || name_p == name)
name_p = strchr(name, ';');
len = (name_p && name_p > name) ? name_p - name : strlen(name);
/* find extension/version and derive length of basename;
for 'keep_suffix', this won't be accurate if version number is
present and delimited by dot instead of semi-colon, but normal
usage is for DEBUGFILES and that uses compiler supplied name */
name_p = strrchr(name, ';');
if (!keep_suffix && (xtra_p = strrchr(name, '.')) != 0)
name_p = xtra_p;
len = (name_p && name_p > name) ? name_p - name : (unsigned) strlen(name);
/* return a lowercase copy of the name in a private static buffer */
base = strncpy(base_name, name, len);