mirror of
https://github.com/FDOS/kernel.git
synced 2025-07-23 22:04:33 +02:00
Fixes from Lixing Yuan: dosnames cleanup, fix for truename with
wildcards and trailing dots. git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@598 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
parent
f83c09df15
commit
bdc63c1ff0
@ -116,8 +116,6 @@ int ParseDosName(const char *filename, char *fcbname, BOOL bAllowWildcards)
|
|||||||
{
|
{
|
||||||
if (*filename != '\0')
|
if (*filename != '\0')
|
||||||
return DE_FILENOTFND;
|
return DE_FILENOTFND;
|
||||||
if (nDirCnt == 1) /* for d:\ */
|
|
||||||
return DE_NFILES;
|
|
||||||
memset(fcbname, '?', FNAME_SIZE + FEXT_SIZE);
|
memset(fcbname, '?', FNAME_SIZE + FEXT_SIZE);
|
||||||
return nDirCnt;
|
return nDirCnt;
|
||||||
}
|
}
|
||||||
|
@ -518,8 +518,10 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
|
|||||||
if (i & PNE_WILDCARD)
|
if (i & PNE_WILDCARD)
|
||||||
gotAnyWildcards = TRUE;
|
gotAnyWildcards = TRUE;
|
||||||
/* strip trailing dot */
|
/* strip trailing dot */
|
||||||
if ((i & PNE_DOT) && *src != '/' && *src != '\\' && *src != '\0')
|
if ((i & PNE_DOT) && *src != '/' && *src != '\\')
|
||||||
{
|
{
|
||||||
|
if (*src == '\0')
|
||||||
|
continue;
|
||||||
/* we arrive here only when an extension-dot has been found */
|
/* we arrive here only when an extension-dot has been found */
|
||||||
addChar('.');
|
addChar('.');
|
||||||
i = parse_name_ext(FEXT_SIZE, &src, &p, dest);
|
i = parse_name_ext(FEXT_SIZE, &src, &p, dest);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user