From bdc63c1ff08f0ee1f11ece243445349c0d9d8c45 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Sun, 15 Jun 2003 18:57:02 +0000 Subject: [PATCH] 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 --- kernel/dosnames.c | 2 -- kernel/newstuff.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/dosnames.c b/kernel/dosnames.c index 9fa1108..18e2735 100644 --- a/kernel/dosnames.c +++ b/kernel/dosnames.c @@ -116,8 +116,6 @@ int ParseDosName(const char *filename, char *fcbname, BOOL bAllowWildcards) { if (*filename != '\0') return DE_FILENOTFND; - if (nDirCnt == 1) /* for d:\ */ - return DE_NFILES; memset(fcbname, '?', FNAME_SIZE + FEXT_SIZE); return nDirCnt; } diff --git a/kernel/newstuff.c b/kernel/newstuff.c index 789bfd1..7219177 100644 --- a/kernel/newstuff.c +++ b/kernel/newstuff.c @@ -518,8 +518,10 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode) if (i & PNE_WILDCARD) gotAnyWildcards = TRUE; /* 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 */ addChar('.'); i = parse_name_ext(FEXT_SIZE, &src, &p, dest);