Improve, but not really fix :/, support for macOS.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index 58bbc09cd903860f8036679e12aaaa93cf732fed..7f2f3285ebcdd1bb1decfae287ef9a1cf8f8e8e7 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -48,6 +48,11 @@ FunctorImpl<decltype(&Function_::operator())> fun(const Function_ &value) {
     return value;
 }
 
+struct Progress {
+    virtual void operator()(const std::string &value) const = 0;
+    virtual void operator()(double value) const = 0;
+};
+
 class Folder {
   public:
     virtual void Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) = 0;
@@ -89,6 +94,8 @@ class SubFolder :
   public:
     SubFolder(Folder &parent, const std::string &path);
 
+    std::string Path(const std::string &path) const;
+
     virtual void Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code);
     virtual bool Look(const std::string &path) const;
     virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
@@ -148,11 +155,11 @@ struct Bundle {
     Hash hash;
 };
 
-Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirement, const Functor<std::string (const std::string &, const std::string &)> &alter, const Functor<void (const std::string &)> &progress, const Functor<void (double)> &percent);
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress);
 
 typedef std::map<uint32_t, Hash> Slots;
 
-Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots, const Functor<void (double)> &percent);
+Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, bool merge, const std::string &requirements, const std::string &key, const Slots &slots, uint32_t flags, bool platform, const Progress &progress);
 
 }