TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-19 09:17:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename unix to posix due to clash with predefined macro

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-08-04 18:39:45 +02:00
parent 0ca272b213
commit 4ec766ab0d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dwarfs/reader/metadata_types.h
View File

@ -49,7 +49,7 @@ class global_metadata;
enum class readlink_mode {
raw,
preferred,
unix,
posix,
};
class inode_view {

2
src/dwarfs/reader/internal/metadata_v2.cpp
View File

@ -732,7 +732,7 @@ class metadata_ final : public metadata_v2::impl {
}
char host_preferred =
static_cast<char>(std::filesystem::path::preferred_separator);
if (mode == readlink_mode::unix) {
if (mode == readlink_mode::posix) {
host_preferred = '/';
}
if (meta_preferred != host_preferred) {

3
src/dwarfs_main.cpp
View File

@ -514,7 +514,8 @@ int op_readlink_common(LogProxy& log_, dwarfs_userdata& userdata,
return checked_call(log_, [&] {
if (auto entry = find()) {
std::error_code ec;
auto link = userdata.fs.readlink(*entry, reader::readlink_mode::unix, ec);
auto link =
userdata.fs.readlink(*entry, reader::readlink_mode::posix, ec);
if (!ec) {
*str = link;
}

14
test/filesystem_test.cpp
View File

@ -87,15 +87,15 @@ TEST(filesystem, metadata_symlink_win) {
}
{
auto buffer = fs.readlink(*i1, reader::readlink_mode::unix);
auto buffer = fs.readlink(*i1, reader::readlink_mode::posix);
EXPECT_EQ("subdir/test.txt", buffer);
buffer = fs.readlink(*i2, reader::readlink_mode::unix);
buffer = fs.readlink(*i2, reader::readlink_mode::posix);
EXPECT_EQ("../subdir/test.txt", buffer);
}
{
std::error_code ec;
auto r = fs.readlink(*i1, reader::readlink_mode::unix, ec);
auto r = fs.readlink(*i1, reader::readlink_mode::posix, ec);
EXPECT_FALSE(ec);
EXPECT_EQ("subdir/test.txt", r);
}
@ -109,7 +109,7 @@ TEST(filesystem, metadata_symlink_win) {
// also test throwing interface
{
auto r = fs.readlink(*i1, reader::readlink_mode::unix);
auto r = fs.readlink(*i1, reader::readlink_mode::posix);
EXPECT_EQ("subdir/test.txt", r);
}
@ -160,15 +160,15 @@ TEST(filesystem, metadata_symlink_unix) {
}
{
auto buffer = fs.readlink(*i1, reader::readlink_mode::unix);
auto buffer = fs.readlink(*i1, reader::readlink_mode::posix);
EXPECT_EQ("subdir/test.txt", buffer);
buffer = fs.readlink(*i2, reader::readlink_mode::unix);
buffer = fs.readlink(*i2, reader::readlink_mode::posix);
EXPECT_EQ("../subdir/test.txt", buffer);
}
{
std::error_code ec;
auto r = fs.readlink(*i1, reader::readlink_mode::unix, ec);
auto r = fs.readlink(*i1, reader::readlink_mode::posix, ec);
EXPECT_FALSE(ec);
EXPECT_EQ("subdir/test.txt", r);
}