Skip to content

truename: drop trailing colon if not on pos 1 [fixes #310] #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stsp merged 1 commit into from
Oct 12, 2026
Merged

truename: drop trailing colon if not on pos 1 [fixes #310] #311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions kernel/newstuff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,21 @@ COUNT truename(__XFAR(const char) src, char FAR *dest, COUNT mode)
return IS_NETWORK;
}

dhp = IsDevice(src); /* returns header if -char- device */
i = fstrlen(src);
if (!i)
return DE_PATHNOTFND;
/* drop trailing ':' unless at pos 1 */
if (i > 2 && src[i - 1] == ':') {
fstrcpy(dest, src);
dest[--i] = '\0';
dhp = IsDevice(dest);
if (!dhp)
return DE_PATHNOTFND;
} else {
dhp = IsDevice(src); /* returns header if -char- device */
}
/* Do we have a drive? */
if (src[1] == ':')
if (i > 1 && src[1] == ':')
{
result = drLetterToNr(DosUpFChar(src0));
cdsEntry = get_cds(result);
Expand Down Expand Up @@ -528,6 +540,9 @@ COUNT truename(__XFAR(const char) src, char FAR *dest, COUNT mode)
while(*src != '/' && *src != '\\' && *src != '\0')
{
char c = *src++;
/* "NUL:" - ignore the colon that follows a device name */
if (c == ':' && *src == '\0' && (result & IS_DEVICE))
break;
if (c == '*')
{
/* register the wildcard, even if no '?' is appended */
Expand Down