hyzboy/CMCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug in ComboFilename

Browse Source
This commit is contained in:
hyzboy 2024-07-26 03:13:42 +08:00
parent 7ba0796b05
commit 1fab7b4ef2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inc/hgl/filesystem/Filename.h
View File

@ -95,12 +95,17 @@ namespace hgl
template<typename T> template<typename T>
inline const String<T> ComboFilename(const StringList<T> &sl,const T spear_char=(T)HGL_DIRECTORY_SEPARATOR_RAWCHAR) inline const String<T> ComboFilename(const StringList<T> &sl,const T spear_char=(T)HGL_DIRECTORY_SEPARATOR_RAWCHAR)
{ {
T **str_list=AutoDeleteArray<T *>(sl.GetCount()); const int count=sl.GetCount();
int *str_len=AutoDeleteArray<int>(sl.GetCount());
if(count<=0)
return String<T>();
AutoDeleteArray<T *> str_list(count);
AutoDeleteArray<int> str_len(count);
int index=0; int index=0;
for(auto str:sl) for(String<T> *str:sl)
{ {
if(str->IsEmpty()) if(str->IsEmpty())
continue; continue;
@ -111,7 +116,7 @@ namespace hgl
++index; ++index;
} }
return ComboFilename(str_list,str_len,sl.GetCount(),spear_char); return ComboFilename(str_list.data(),str_len,count,spear_char);
} }
/** /**
@ -350,6 +355,11 @@ namespace hgl
return old_name+String<T>::charOf(split_char)+new_extname; return old_name+String<T>::charOf(split_char)+new_extname;
} }
#ifdef HGL_SUPPORT_CHAR8_T
inline AnsiString MergeFilename(const AnsiString &pathname,const AnsiString &filename) ///<组合路径名与文件名
{return MergeFilename<char>(pathname,filename,HGL_DIRECTORY_SEPARATOR,HGL_DIRECTORY_SEPARATOR_RAWSTR);}
#endif//HGL_SUPPORT_CHAR8_T
inline UTF8String MergeFilename(const UTF8String &pathname,const UTF8String &filename) ///<组合路径名与文件名 inline UTF8String MergeFilename(const UTF8String &pathname,const UTF8String &filename) ///<组合路径名与文件名
{return MergeFilename<u8char>(pathname,filename,HGL_DIRECTORY_SEPARATOR,HGL_DIRECTORY_SEPARATOR_U8STR);} {return MergeFilename<u8char>(pathname,filename,HGL_DIRECTORY_SEPARATOR,HGL_DIRECTORY_SEPARATOR_U8STR);}