Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moving file system functions into together.

Browse Source
This commit is contained in:
Бранимир Караџић
2019-02-20 19:55:37 -08:00
parent 5a14ea6c36
commit c2b624a8ec
5 changed files with 192 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/bx/file.h
View File

@@ -122,6 +122,22 @@ namespace bx
/// FIle stat.
bool stat(FileInfo& _outFileInfo, const FilePath& _filePath);
/// Creates a directory named `_filePath`.
///
bool make(const FilePath& _filePath, Error* _err = NULL);
/// Creates a directory named `_filePath` along with all necessary parents.
///
bool makeAll(const FilePath& _filePath, Error* _err = NULL);
/// Removes file or directory.
///
bool remove(const FilePath& _filePath, Error* _err = NULL);
/// Removes file or directory recursivelly.
///
bool removeAll(const FilePath& _filePath, Error* _err = NULL);
} // namespace bx
#endif // BX_FILE_H_HEADER_GUARD

16
include/bx/filepath.h
View File

@@ -115,22 +115,6 @@ namespace bx
char m_filePath[kMaxFilePath];
};
/// Creates a directory named `_filePath`.
///
bool make(const FilePath& _filePath, Error* _err = NULL);
/// Creates a directory named `_filePath` along with all necessary parents.
///
bool makeAll(const FilePath& _filePath, Error* _err = NULL);
/// Removes file or directory.
///
bool remove(const FilePath& _filePath, Error* _err = NULL);
/// Removes file or directory recursivelly.
///
bool removeAll(const FilePath& _filePath, Error* _err = NULL);
} // namespace bx
#endif // BX_FILEPATH_H_HEADER_GUARD

176
src/file.cpp
View File

@@ -20,8 +20,13 @@
# if BX_CONFIG_CRT_DIRECTORY_READER
# include <dirent.h>
# endif // BX_CONFIG_CRT_DIRECTORY_READER
# include <stdio.h>
# include <sys/stat.h>
# include <stdio.h> // remove
# if BX_CRT_MSVC
# include <direct.h> // _getcwd
# else
# include <sys/stat.h> // stat, mkdir
# include <unistd.h> // getcwd
# endif // BX_CRT_MSVC
#endif // !BX_CRT_NONE
namespace bx
@@ -783,4 +788,171 @@ namespace bx
#endif // BX_CRT_NONE
}
bool make(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (!_err->isOk() )
{
return false;
}
#if BX_CRT_MSVC
int32_t result = ::_mkdir(_filePath.getCPtr() );
#elif BX_CRT_MINGW
int32_t result = ::mkdir(_filePath.getCPtr());
#elif BX_CRT_NONE
BX_UNUSED(_filePath);
int32_t result = -1;
#else
int32_t result = ::mkdir(_filePath.getCPtr(), 0700);
#endif // BX_CRT_MSVC
if (0 != result)
{
BX_ERROR_SET(_err, BX_ERROR_ACCESS, "The parent directory does not allow write permission to the process.");
return false;
}
return true;
}
bool makeAll(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (!_err->isOk() )
{
return false;
}
FileInfo fi;
if (stat(fi, _filePath) )
{
if (FileType::Dir == fi.type)
{
return true;
}
BX_ERROR_SET(_err, BX_ERROR_NOT_DIRECTORY, "File already exist, and is not directory.");
return false;
}
const StringView dir = strRTrim(_filePath, "/");
const StringView slash = strRFind(dir, '/');
if (!slash.isEmpty()
&& slash.getPtr() - dir.getPtr() > 1)
{
if (!makeAll(StringView(dir.getPtr(), slash.getPtr() ), _err) )
{
return false;
}
}
FilePath path(dir);
return make(path, _err);
}
bool remove(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (!_err->isOk() )
{
return false;
}
#if BX_CRT_MSVC
int32_t result = -1;
FileInfo fi;
if (stat(fi, _filePath) )
{
if (FileType::Dir == fi.type)
{
result = ::_rmdir(_filePath.getCPtr() );
}
else
{
result = ::remove(_filePath.getCPtr() );
}
}
#elif BX_CRT_NONE
BX_UNUSED(_filePath);
int32_t result = -1;
#else
int32_t result = ::remove(_filePath.getCPtr() );
#endif // BX_CRT_MSVC
if (0 != result)
{
BX_ERROR_SET(_err, BX_ERROR_ACCESS, "The parent directory does not allow write permission to the process.");
return false;
}
return true;
}
bool removeAll(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (remove(_filePath, _err) )
{
return true;
}
_err->reset();
FileInfo fi;
if (!stat(fi, _filePath) )
{
BX_ERROR_SET(_err, BX_ERROR_ACCESS, "The parent directory does not allow write permission to the process.");
return false;
}
if (FileType::Dir != fi.type)
{
BX_ERROR_SET(_err, BX_ERROR_NOT_DIRECTORY, "File already exist, and is not directory.");
return false;
}
Error err;
DirectoryReader dr;
if (!bx::open(&dr, _filePath) )
{
BX_ERROR_SET(_err, BX_ERROR_NOT_DIRECTORY, "File already exist, and is not directory.");
return false;
}
while (err.isOk() )
{
bx::read(&dr, fi, &err);
if (err.isOk() )
{
if (0 == strCmp(fi.filePath, ".")
|| 0 == strCmp(fi.filePath, "..") )
{
continue;
}
FilePath path(_filePath);
path.join(fi.filePath);
if (!removeAll(path, _err) )
{
_err->reset();
break;
}
}
}
bx::close(&dr);
return remove(_filePath, _err);
}
} // namespace bx

172
src/filepath.cpp
View File

@@ -9,15 +9,12 @@
#include <bx/readerwriter.h>
#if !BX_CRT_NONE
# include <stdio.h> // remove
# if BX_CRT_MSVC
# include <direct.h> // _getcwd
# else
# include <sys/stat.h> // mkdir
# include <unistd.h> // getcwd
# endif // BX_CRT_MSVC
#endif // 0
#endif // !BX_CRT_NONE
#if BX_PLATFORM_WINDOWS
extern "C" __declspec(dllimport) unsigned long __stdcall GetTempPathA(unsigned long _max, char* _ptr);
@@ -408,171 +405,4 @@ namespace bx
return 0 == strCmp(m_filePath, ".");
}
bool make(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (!_err->isOk() )
{
return false;
}
#if BX_CRT_MSVC
int32_t result = ::_mkdir(_filePath.getCPtr() );
#elif BX_CRT_MINGW
int32_t result = ::mkdir(_filePath.getCPtr());
#elif BX_CRT_NONE
BX_UNUSED(_filePath);
int32_t result = -1;
#else
int32_t result = ::mkdir(_filePath.getCPtr(), 0700);
#endif // BX_CRT_MSVC
if (0 != result)
{
BX_ERROR_SET(_err, BX_ERROR_ACCESS, "The parent directory does not allow write permission to the process.");
return false;
}
return true;
}
bool makeAll(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (!_err->isOk() )
{
return false;
}
FileInfo fi;
if (stat(fi, _filePath) )
{
if (FileType::Dir == fi.type)
{
return true;
}
BX_ERROR_SET(_err, BX_ERROR_NOT_DIRECTORY, "File already exist, and is not directory.");
return false;
}
const StringView dir = strRTrim(_filePath, "/");
const StringView slash = strRFind(dir, '/');
if (!slash.isEmpty()
&& slash.getPtr() - dir.getPtr() > 1)
{
if (!makeAll(StringView(dir.getPtr(), slash.getPtr() ), _err) )
{
return false;
}
}
FilePath path(dir);
return make(path, _err);
}
bool remove(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (!_err->isOk() )
{
return false;
}
#if BX_CRT_MSVC
int32_t result = -1;
FileInfo fi;
if (stat(fi, _filePath) )
{
if (FileType::Dir == fi.type)
{
result = ::_rmdir(_filePath.getCPtr() );
}
else
{
result = ::remove(_filePath.getCPtr() );
}
}
#elif BX_CRT_NONE
BX_UNUSED(_filePath);
int32_t result = -1;
#else
int32_t result = ::remove(_filePath.getCPtr() );
#endif // BX_CRT_MSVC
if (0 != result)
{
BX_ERROR_SET(_err, BX_ERROR_ACCESS, "The parent directory does not allow write permission to the process.");
return false;
}
return true;
}
bool removeAll(const FilePath& _filePath, Error* _err)
{
BX_ERROR_SCOPE(_err);
if (remove(_filePath, _err) )
{
return true;
}
_err->reset();
FileInfo fi;
if (!stat(fi, _filePath) )
{
BX_ERROR_SET(_err, BX_ERROR_ACCESS, "The parent directory does not allow write permission to the process.");
return false;
}
if (FileType::Dir != fi.type)
{
BX_ERROR_SET(_err, BX_ERROR_NOT_DIRECTORY, "File already exist, and is not directory.");
return false;
}
Error err;
DirectoryReader dr;
if (!bx::open(&dr, _filePath) )
{
BX_ERROR_SET(_err, BX_ERROR_NOT_DIRECTORY, "File already exist, and is not directory.");
return false;
}
while (err.isOk() )
{
bx::read(&dr, fi, &err);
if (err.isOk() )
{
if (0 == strCmp(fi.filePath, ".")
|| 0 == strCmp(fi.filePath, "..") )
{
continue;
}
FilePath path(_filePath);
path.join(fi.filePath);
if (!removeAll(path, _err) )
{
_err->reset();
break;
}
}
}
bx::close(&dr);
return remove(_filePath, _err);
}
} // namespace bx

2
tests/filepath_test.cpp
View File

@@ -4,7 +4,7 @@
*/
#include "test.h"
#include <bx/filepath.h>
#include <bx/file.h>
struct FilePathTest
{