test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-30 10:57:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

scan_dir::rmdir_callback: rmdir the empty directory as default

Browse Source
This commit is contained in:
zsx 2019-02-02 14:18:17 +08:00
parent 0447653edd
commit 4934df5291
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib_acl_cpp/include/acl_cpp/stdlib/scan_dir.hpp
View File

@ -23,15 +23,12 @@ public:
bool open(const char* path, bool recursive = true, bool rmdir_on = false);
/**
* 虚方法，当需要删除空目录时，子类可以实现此虚方法来删除传入的目录
* 虚方法，当需要删除空目录时，子类可以实现此虚方法来删除传入的目录，
* 本虚方法内部会自动调用 rmdir 删除空目录
* @param path {const char*} 需要被删除的空目录
* @return {bool} 删除目录是否成功
*/
virtual bool rmdir_callback(const char* path)
{
(void) path;
return false;
}
virtual bool rmdir_callback(const char* path);
/**
* 关闭目录，同时释放内部资源

15
lib_acl_cpp/src/stdlib/scan_dir.cpp
View File

@ -88,6 +88,21 @@ int scan_dir::rmdir_def(ACL_SCAN_DIR*, const char* path, void* ctx)
return me->rmdir_callback(path) ? 0 : -1;
}
bool scan_dir::rmdir_callback(const char* path)
{
#ifdef ACL_WINDOWS
if (_rmdir(path) == 0) {
return true;
#else
if (rmdir(path) == 0) {
return true;
#endif
} else {
logger_error("rmdir error=%s, path=%s", last_serror(), path);
return false;
}
}
const char* scan_dir::next_file(bool full /* = false */)
{
if (scan_ == NULL) {