Skip to content

feat: add visibility support #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tachi107 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add visibility support #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set_target_properties(zarchive PROPERTIES
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
CXX_VISIBILITY_PRESET "hidden"
)

target_include_directories(zarchive
Expand Down
27 changes: 27 additions & 0 deletions include/zarchive/zarchivecommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,33 @@
# endif
#endif

/* Visibility */
#if defined _WIN32 || defined __CYGWIN__
# ifdef ZAR_SHARED_LIB
# ifdef ZAR_IMPLEMENTATION
# ifdef __GNUC__
# define ZAR_PUB __attribute__ ((dllexport))
# else
# define ZAR_PUB __declspec(dllexport)
# endif
# else
# ifdef __GNUC__
# define ZAR_PUB __attribute__ ((dllimport))
# else
# define ZAR_PUB __declspec(dllimport)
# endif
# endif
# else
# define ZAR_PUB
# endif
#else
# if defined(__GNUC__) && __GNUC__ >= 4
# define ZAR_PUB __attribute__ ((visibility ("default")))
# else
# define ZAR_PUB
# endif
#endif

namespace _ZARCHIVE
{
inline constexpr size_t COMPRESSED_BLOCK_SIZE = 64 * 1024; // 64KiB
Expand Down
20 changes: 10 additions & 10 deletions include/zarchive/zarchivereader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,29 @@ static inline ZArchiveNodeHandle ZARCHIVE_INVALID_NODE = 0xFFFFFFFF;
class ZArchiveReader
{
public:
struct DirEntry
struct ZAR_PUB DirEntry
{
std::string_view name;
bool isFile;
bool isDirectory;
uint64_t size; // only valid for directories
};

static ZArchiveReader* OpenFromFile(const std::filesystem::path& path);
ZAR_PUB static ZArchiveReader* OpenFromFile(const std::filesystem::path& path);

~ZArchiveReader();
ZAR_PUB ~ZArchiveReader();

ZArchiveNodeHandle LookUp(std::string_view path, bool allowFile = true, bool allowDirectory = true);
bool IsDirectory(ZArchiveNodeHandle nodeHandle) const;
bool IsFile(ZArchiveNodeHandle nodeHandle) const;
ZAR_PUB ZArchiveNodeHandle LookUp(std::string_view path, bool allowFile = true, bool allowDirectory = true);
ZAR_PUB bool IsDirectory(ZArchiveNodeHandle nodeHandle) const;
ZAR_PUB bool IsFile(ZArchiveNodeHandle nodeHandle) const;

// directory operations
uint32_t GetDirEntryCount(ZArchiveNodeHandle nodeHandle) const;
bool GetDirEntry(ZArchiveNodeHandle nodeHandle, uint32_t index, DirEntry& dirEntry) const;
ZAR_PUB uint32_t GetDirEntryCount(ZArchiveNodeHandle nodeHandle) const;
ZAR_PUB bool GetDirEntry(ZArchiveNodeHandle nodeHandle, uint32_t index, DirEntry& dirEntry) const;

// file operations
uint64_t GetFileSize(ZArchiveNodeHandle nodeHandle);
uint64_t ReadFromFile(ZArchiveNodeHandle nodeHandle, uint64_t offset, uint64_t length, void* buffer);
ZAR_PUB uint64_t GetFileSize(ZArchiveNodeHandle nodeHandle);
ZAR_PUB uint64_t ReadFromFile(ZArchiveNodeHandle nodeHandle, uint64_t offset, uint64_t length, void* buffer);

private:
struct CacheBlock
Expand Down
12 changes: 6 additions & 6 deletions include/zarchive/zarchivewriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ class ZArchiveWriter
typedef void(*CB_NewOutputFile)(const int32_t partIndex, void* ctx);
typedef void(*CB_WriteOutputData)(const void* data, size_t length, void* ctx);

ZArchiveWriter(CB_NewOutputFile cbNewOutputFile, CB_WriteOutputData cbWriteOutputData, void* ctx);
~ZArchiveWriter();
ZAR_PUB ZArchiveWriter(CB_NewOutputFile cbNewOutputFile, CB_WriteOutputData cbWriteOutputData, void* ctx);
ZAR_PUB ~ZArchiveWriter();

bool StartNewFile(const char* path); // creates a new virtual file and makes it active
void AppendData(const void* data, size_t size); // appends data to currently active file
bool MakeDir(const char* path, bool recursive = false);
void Finalize();
ZAR_PUB bool StartNewFile(const char* path); // creates a new virtual file and makes it active
ZAR_PUB void AppendData(const void* data, size_t size); // appends data to currently active file
ZAR_PUB bool MakeDir(const char* path, bool recursive = false);
ZAR_PUB void Finalize();

private:
PathNode* GetNodeByPath(PathNode* root, std::string_view path);
Expand Down
23 changes: 13 additions & 10 deletions src/zarchivereader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <zstd.h>
#include <cassert>

/* Used to export ZAR_PUB symbols on Windows */
#define ZAR_IMPLEMENTATION

static uint64_t _ifstream_getFileSize(std::ifstream& file)
{
file.seekg(0, std::ios_base::end);
Expand All @@ -26,7 +29,7 @@ static uint64_t _getValidElementCount(uint64_t size, uint64_t elementSize)
return size / elementSize;
}

ZArchiveReader* ZArchiveReader::OpenFromFile(const std::filesystem::path& path)
ZAR_PUB ZArchiveReader* ZArchiveReader::OpenFromFile(const std::filesystem::path& path)
{
std::ifstream file;
file.open(path, std::ios_base::in | std::ios_base::binary);
Expand Down Expand Up @@ -117,12 +120,12 @@ ZArchiveReader::ZArchiveReader(std::ifstream&& file, std::vector<_ZARCHIVE::Comp
m_cacheBlocks.back().next = nullptr;
}

ZArchiveReader::~ZArchiveReader()
ZAR_PUB ZArchiveReader::~ZArchiveReader()
{

}

ZArchiveNodeHandle ZArchiveReader::LookUp(std::string_view path, bool allowFile, bool allowDirectory)
ZAR_PUB ZArchiveNodeHandle ZArchiveReader::LookUp(std::string_view path, bool allowFile, bool allowDirectory)
{
std::string_view pathParser = path;
uint32_t currentNode = 0;
Expand Down Expand Up @@ -158,21 +161,21 @@ ZArchiveNodeHandle ZArchiveReader::LookUp(std::string_view path, bool allowFile,
return ZARCHIVE_INVALID_NODE;
}

bool ZArchiveReader::IsDirectory(ZArchiveNodeHandle nodeHandle) const
ZAR_PUB bool ZArchiveReader::IsDirectory(ZArchiveNodeHandle nodeHandle) const
{
if (nodeHandle >= m_fileTree.size())
return false;
return !m_fileTree[nodeHandle].IsFile();
}

bool ZArchiveReader::IsFile(ZArchiveNodeHandle nodeHandle) const
ZAR_PUB bool ZArchiveReader::IsFile(ZArchiveNodeHandle nodeHandle) const
{
if (nodeHandle >= m_fileTree.size())
return false;
return m_fileTree[nodeHandle].IsFile();
}

uint32_t ZArchiveReader::GetDirEntryCount(ZArchiveNodeHandle nodeHandle) const
ZAR_PUB uint32_t ZArchiveReader::GetDirEntryCount(ZArchiveNodeHandle nodeHandle) const
{
if (nodeHandle >= m_fileTree.size())
return 0;
Expand All @@ -182,7 +185,7 @@ uint32_t ZArchiveReader::GetDirEntryCount(ZArchiveNodeHandle nodeHandle) const
return entry.directoryRecord.count;
}

bool ZArchiveReader::GetDirEntry(ZArchiveNodeHandle nodeHandle, uint32_t index, DirEntry& dirEntry) const
ZAR_PUB bool ZArchiveReader::GetDirEntry(ZArchiveNodeHandle nodeHandle, uint32_t index, DirEntry& dirEntry) const
{
if (nodeHandle >= m_fileTree.size())
return false;
Expand All @@ -204,7 +207,7 @@ bool ZArchiveReader::GetDirEntry(ZArchiveNodeHandle nodeHandle, uint32_t index,
return true;
}

uint64_t ZArchiveReader::GetFileSize(ZArchiveNodeHandle nodeHandle)
ZAR_PUB uint64_t ZArchiveReader::GetFileSize(ZArchiveNodeHandle nodeHandle)
{
if (nodeHandle >= m_fileTree.size())
return 0;
Expand All @@ -214,7 +217,7 @@ uint64_t ZArchiveReader::GetFileSize(ZArchiveNodeHandle nodeHandle)
return file.GetFileSize();
}

uint64_t ZArchiveReader::ReadFromFile(ZArchiveNodeHandle nodeHandle, uint64_t offset, uint64_t length, void* buffer)
ZAR_PUB uint64_t ZArchiveReader::ReadFromFile(ZArchiveNodeHandle nodeHandle, uint64_t offset, uint64_t length, void* buffer)
{
if (nodeHandle >= m_fileTree.size())
return 0;
Expand Down Expand Up @@ -368,4 +371,4 @@ std::string_view ZArchiveReader::GetName(const std::vector<uint8_t>& nameTable,
if ((nameOffset + (uint32_t)nameLength) > nameTable.size())
return "";
return std::basic_string_view<char>((char*)nameTable.data() + nameOffset, nameLength);
}
}
15 changes: 9 additions & 6 deletions src/zarchivewriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@
#include <cassert>
#include <algorithm>

ZArchiveWriter::ZArchiveWriter(CB_NewOutputFile cbNewOutputFile, CB_WriteOutputData cbWriteOutputData, void* ctx) : m_cbCtx(ctx), m_cbNewOutputFile(cbNewOutputFile), m_cbWriteOutputData(cbWriteOutputData)
/* Used to export ZAR_PUB symbols on Windows */
#define ZAR_IMPLEMENTATION

ZAR_PUB ZArchiveWriter::ZArchiveWriter(CB_NewOutputFile cbNewOutputFile, CB_WriteOutputData cbWriteOutputData, void* ctx) : m_cbCtx(ctx), m_cbNewOutputFile(cbNewOutputFile), m_cbWriteOutputData(cbWriteOutputData)
{
cbNewOutputFile(-1, ctx);
m_mainShaCtx = (struct Sha_256*)malloc(sizeof(struct Sha_256));
sha_256_init(m_mainShaCtx, m_integritySha);
};

ZArchiveWriter::~ZArchiveWriter()
ZAR_PUB ZArchiveWriter::~ZArchiveWriter()
{
free(m_mainShaCtx);
}
Expand Down Expand Up @@ -53,7 +56,7 @@ ZArchiveWriter::PathNode* ZArchiveWriter::FindSubnodeByName(ZArchiveWriter::Path
return nullptr;
}

bool ZArchiveWriter::StartNewFile(const char* path)
ZAR_PUB bool ZArchiveWriter::StartNewFile(const char* path)
{
m_currentFileNode = nullptr;
std::string_view pathParser = path;
Expand All @@ -71,7 +74,7 @@ bool ZArchiveWriter::StartNewFile(const char* path)
return true;
}

bool ZArchiveWriter::MakeDir(const char* path, bool recursive)
ZAR_PUB bool ZArchiveWriter::MakeDir(const char* path, bool recursive)
{
std::string_view pathParser = path;
while (!pathParser.empty() && (pathParser.back() == '/' || pathParser.back() == '\\'))
Expand Down Expand Up @@ -158,7 +161,7 @@ void ZArchiveWriter::StoreBlock(const uint8_t* uncompressedData)
m_numWrittenOffsetRecords++;
}

void ZArchiveWriter::AppendData(const void* data, size_t size)
ZAR_PUB void ZArchiveWriter::AppendData(const void* data, size_t size)
{
size_t dataSize = size;
const uint8_t* input = (const uint8_t*)data;
Expand Down Expand Up @@ -189,7 +192,7 @@ void ZArchiveWriter::AppendData(const void* data, size_t size)
m_currentInputOffset += dataSize;
}

void ZArchiveWriter::Finalize()
ZAR_PUB void ZArchiveWriter::Finalize()
{
m_currentFileNode = nullptr; // make sure the padding added below doesn't modify the active file
// flush write buffer by padding it to the length of a full block
Expand Down