Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxSplitPath() handles correctly filenames with '.' but without extension

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-04 19:35:32 +00:00
parent 5f83a4540d
commit 2a6f6231ce
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/filefn.cpp
View File

@@ -1500,29 +1500,35 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
wxString *pstrName, wxString *pstrName,
wxString *pstrExt) wxString *pstrExt)
{ {
wxCHECK_RET( pszFileName, _("NULL file name in wxSplitPath") ); wxCHECK_RET( pszFileName, "NULL file name in wxSplitPath" );
const char *pDot = strrchr(pszFileName, FILE_SEP_EXT); const char *pDot = strrchr(pszFileName, FILE_SEP_EXT);
const char *pSepUnix = strrchr(pszFileName, FILE_SEP_PATH_UNIX); const char *pSepUnix = strrchr(pszFileName, FILE_SEP_PATH_UNIX);
const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS); const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
// take the last of the two // take the last of the two: nPosUnix containts the last slash in the
// filename
size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0; size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0; size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0;
if ( nPosDos > nPosUnix ) if ( nPosDos > nPosUnix )
nPosUnix = nPosDos; nPosUnix = nPosDos;
// size_t nLen = Strlen(pszFileName);
if ( pstrPath ) if ( pstrPath )
*pstrPath = wxString(pszFileName, nPosUnix); *pstrPath = wxString(pszFileName, nPosUnix);
if ( pDot ) {
size_t nPosDot = pDot - pszFileName; size_t nPosDot = 0;
if ( pDot )
nPosDot = pDot - pszFileName;
if ( nPosDot > nPosUnix ) {
// the file name looks like "path/name.ext"
if ( pstrName ) if ( pstrName )
*pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix); *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
if ( pstrExt ) if ( pstrExt )
*pstrExt = wxString(pszFileName + nPosDot + 1); *pstrExt = wxString(pszFileName + nPosDot + 1);
} }
else { else {
// there is either no dot at all or there is a '/' after it
if ( pstrName ) if ( pstrName )
*pstrName = wxString(pszFileName + nPosUnix + 1); *pstrName = wxString(pszFileName + nPosUnix + 1);
if ( pstrExt ) if ( pstrExt )