summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/knarc/Makefile4
-rw-r--r--tools/knarc/Narc.cpp52
-rw-r--r--tools/knarc/Narc.h8
-rw-r--r--tools/knarc/Source.cpp1
4 files changed, 32 insertions, 33 deletions
diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile
index 4e5e7971..336fad3f 100644
--- a/tools/knarc/Makefile
+++ b/tools/knarc/Makefile
@@ -9,9 +9,9 @@ HEADERS := Narc.h
all: knarc
@:
-
+
knarc: $(SRCS) $(HEADERS)
- $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
+ $(CXX) $(SRCS) -o $@ $(LDFLAGS) $(CXXFLAGS)
clean:
$(RM) knarc knarc.exe
diff --git a/tools/knarc/Narc.cpp b/tools/knarc/Narc.cpp
index 5e2713dd..4cdb4b63 100644
--- a/tools/knarc/Narc.cpp
+++ b/tools/knarc/Narc.cpp
@@ -3,7 +3,7 @@
#include <algorithm>
#include <cstddef>
#include <cstdint>
-#include <filesystem>
+#include <experimental/filesystem>
#include <fstream>
#include <iomanip>
#include <ios>
@@ -46,16 +46,16 @@ bool Narc::Cleanup(ofstream& ofs, const NarcError& e)
return false;
}
-vector<filesystem::directory_entry> Narc::OrderedDirectoryIterator(const filesystem::path& path, bool recursive) const
+vector<experimental::filesystem::directory_entry> Narc::OrderedDirectoryIterator(const experimental::filesystem::path& path, bool recursive) const
{
- vector<filesystem::directory_entry> v;
+ vector<experimental::filesystem::directory_entry> v;
- for (const auto& de : filesystem::directory_iterator(path))
+ for (const auto& de : experimental::filesystem::directory_iterator(path))
{
v.push_back(de);
}
- sort(v.begin(), v.end(), [](const filesystem::directory_entry& a, const filesystem::directory_entry& b)
+ sort(v.begin(), v.end(), [](const experimental::filesystem::directory_entry& a, const experimental::filesystem::directory_entry& b)
{
// I fucking hate C++
string aStr = a.path().filename().string();
@@ -80,9 +80,9 @@ vector<filesystem::directory_entry> Narc::OrderedDirectoryIterator(const filesys
for (size_t i = 0; i < vSize; ++i)
{
- if (v[i].is_directory())
+ if (is_directory(v[i]))
{
- vector<filesystem::directory_entry> temp = OrderedDirectoryIterator(v[i], true);
+ vector<experimental::filesystem::directory_entry> temp = OrderedDirectoryIterator(v[i], true);
v.insert(v.end(), temp.begin(), temp.end());
}
@@ -97,7 +97,7 @@ NarcError Narc::GetError() const
return error;
}
-bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& directory)
+bool Narc::Pack(const experimental::filesystem::path& fileName, const experimental::filesystem::path& directory)
{
ofstream ofs(fileName, ios::binary);
@@ -108,7 +108,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
for (const auto& de : OrderedDirectoryIterator(directory, true))
{
- if (de.is_directory())
+ if (is_directory(de))
{
++directoryCounter;
}
@@ -130,7 +130,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
}
}
- fatEntries.back().End = fatEntries.back().Start + static_cast<uint32_t>(de.file_size());
+ fatEntries.back().End = fatEntries.back().Start + static_cast<uint32_t>(file_size(de));
}
}
@@ -142,8 +142,8 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
.Reserved = 0x0
};
- map<filesystem::path, string> subTables;
- vector<filesystem::path> paths;
+ map<experimental::filesystem::path, string> subTables;
+ vector<experimental::filesystem::path> paths;
directoryCounter = 0;
@@ -155,7 +155,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
paths.push_back(de.path().parent_path());
}
- if (de.is_directory())
+ if (is_directory(de))
{
++directoryCounter;
@@ -178,7 +178,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
vector<FileNameTableEntry> fntEntries;
- if (!regex_match(filesystem::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
+ if (!regex_match(experimental::filesystem::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
{
fntEntries.push_back(
{
@@ -228,7 +228,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
.ChunkSize = sizeof(FileNameTable) + (fntEntries.size() * sizeof(FileNameTableEntry))
};
- if (!regex_match(filesystem::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
+ if (!regex_match(experimental::filesystem::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
{
for (const auto& subTable : subTables)
{
@@ -277,7 +277,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
ofs.write(reinterpret_cast<char*>(&entry), sizeof(FileNameTableEntry));
}
- if (!regex_match(filesystem::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
+ if (!regex_match(experimental::filesystem::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
{
for (const auto& path : paths)
{
@@ -291,7 +291,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
for (const auto& de : OrderedDirectoryIterator(directory, true))
{
- if (de.is_directory())
+ if (is_directory(de))
{
continue;
}
@@ -322,7 +322,7 @@ bool Narc::Pack(const filesystem::path& fileName, const filesystem::path& direct
return error == NarcError::None ? true : false;
}
-bool Narc::Unpack(const filesystem::path& fileName, const filesystem::path& directory)
+bool Narc::Unpack(const experimental::filesystem::path& fileName, const experimental::filesystem::path& directory)
{
ifstream ifs(fileName, ios::binary);
@@ -428,8 +428,8 @@ bool Narc::Unpack(const filesystem::path& fileName, const filesystem::path& dire
if (fi.Id != 0x46494D47) { return Cleanup(ifs, NarcError::InvalidFileImagesId); }
- filesystem::create_directory(directory);
- filesystem::current_path(directory);
+ experimental::filesystem::create_directory(directory);
+ experimental::filesystem::current_path(directory);
if (fnt.ChunkSize == 0x10)
{
@@ -458,11 +458,11 @@ bool Narc::Unpack(const filesystem::path& fileName, const filesystem::path& dire
}
else
{
- filesystem::path absolutePath = filesystem::absolute(filesystem::current_path());
+ experimental::filesystem::path absolutePath = experimental::filesystem::absolute(experimental::filesystem::current_path());
for (size_t i = 0; i < fntEntries.size(); ++i)
{
- filesystem::current_path(absolutePath);
+ experimental::filesystem::current_path(absolutePath);
stack<string> directories;
for (uint16_t j = fntEntries[i].Utility; j > 0xF000; j = fntEntries[j - 0xF000].Utility)
@@ -472,14 +472,14 @@ bool Narc::Unpack(const filesystem::path& fileName, const filesystem::path& dire
for (; !directories.empty(); directories.pop())
{
- filesystem::create_directory(directories.top());
- filesystem::current_path(directories.top());
+ experimental::filesystem::create_directory(directories.top());
+ experimental::filesystem::current_path(directories.top());
}
if (fntEntries[i].Utility >= 0xF000)
{
- filesystem::create_directory(fileNames.get()[0xF000 + i]);
- filesystem::current_path(fileNames.get()[0xF000 + i]);
+ experimental::filesystem::create_directory(fileNames.get()[0xF000 + i]);
+ experimental::filesystem::current_path(fileNames.get()[0xF000 + i]);
}
ifs.seekg(static_cast<uint64_t>(header.ChunkSize) + fat.ChunkSize + sizeof(FileNameTable) + fntEntries[i].Offset);
diff --git a/tools/knarc/Narc.h b/tools/knarc/Narc.h
index d9de52bb..515a1cc2 100644
--- a/tools/knarc/Narc.h
+++ b/tools/knarc/Narc.h
@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
-#include <filesystem>
+#include <experimental/filesystem>
#include <fstream>
#include <string>
#include <vector>
@@ -71,8 +71,8 @@ class Narc
public:
NarcError GetError() const;
- bool Pack(const std::filesystem::path& fileName, const std::filesystem::path& directory);
- bool Unpack(const std::filesystem::path& fileName, const std::filesystem::path& directory);
+ bool Pack(const std::experimental::filesystem::path& fileName, const std::experimental::filesystem::path& directory);
+ bool Unpack(const std::experimental::filesystem::path& fileName, const std::experimental::filesystem::path& directory);
private:
NarcError error = NarcError::None;
@@ -82,5 +82,5 @@ class Narc
bool Cleanup(std::ifstream& ifs, const NarcError& e);
bool Cleanup(std::ofstream& ofs, const NarcError& e);
- std::vector<std::filesystem::directory_entry> OrderedDirectoryIterator(const std::filesystem::path& path, bool recursive) const;
+ std::vector<std::experimental::filesystem::directory_entry> OrderedDirectoryIterator(const std::experimental::filesystem::path& path, bool recursive) const;
};
diff --git a/tools/knarc/Source.cpp b/tools/knarc/Source.cpp
index 3678997c..51bb5320 100644
--- a/tools/knarc/Source.cpp
+++ b/tools/knarc/Source.cpp
@@ -1,5 +1,4 @@
#include <cstring>
-#include <filesystem>
#include <iostream>
#include <string>
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 18:48:02 +0000