Improve compatibility across different Cydia eras.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index 13b69da36ffcd9b4c0f6ec5f0692b1f3d46f24a0..503ebc5658cdff1b4f40916e4e772f1d276bd3c0 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -48,11 +48,16 @@ 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;
     virtual bool Look(const std::string &path) const = 0;
-    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) const = 0;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const = 0;
     virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const = 0;
 };
 
@@ -63,8 +68,10 @@ class DiskFolder :
     const std::string path_;
     std::map<std::string, std::string> commit_;
 
+  protected:
     std::string Path(const std::string &path) const;
 
+  private:
     void Find(const std::string &root, const std::string &base, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;
 
   public:
@@ -73,7 +80,7 @@ class DiskFolder :
 
     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 &, const void *)> &code) const;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
     virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;
 };
 
@@ -89,7 +96,7 @@ class SubFolder :
 
     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 &, const void *)> &code) const;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
     virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;
 };
 
@@ -97,34 +104,26 @@ class UnionFolder :
     public Folder
 {
   private:
-    class StringBuffer :
-        public std::stringbuf
-    {
-      public:
-        StringBuffer() {
-        }
-
-        StringBuffer(const StringBuffer &rhs) :
-            std::stringbuf(rhs.str())
-        {
-        }
+    struct Reset {
+        const void *flag_;
+        std::streambuf *data_;
     };
 
     Folder &parent_;
     std::set<std::string> deletes_;
 
     std::map<std::string, std::string> remaps_;
-    mutable std::map<std::string, std::pair<StringBuffer, const void *>> resets_;
+    mutable std::map<std::string, Reset> resets_;
 
     std::string Map(const std::string &path) const;
-    void Map(const std::string &path, const Functor<void (const std::string &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, const void *)> &)> &save) const;
+    void Map(const std::string &path, const Functor<void (const std::string &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, size_t, const void *)> &)> &save) const;
 
   public:
     UnionFolder(Folder &parent);
 
     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 &, const void *)> &code) const;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
     virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;
 
     void operator ()(const std::string &from) {
@@ -136,24 +135,29 @@ class UnionFolder :
         remaps_[to] = from;
     }
 
-    std::stringbuf &operator ()(const std::string &from, const void *flag) {
+    void operator ()(const std::string &from, const void *flag, std::streambuf &data) {
         operator ()(from);
         auto &reset(resets_[from]);
-        reset.second = flag;
-        return reset.first;
+        reset.flag_ = flag;
+        reset.data_ = &data;
     }
 };
 
+struct Hash {
+    uint8_t sha1_[0x14];
+    uint8_t sha256_[0x20];
+};
+
 struct Bundle {
     std::string path;
-    std::vector<char> hash;
+    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);
+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, std::vector<char>> Slots;
+typedef std::map<uint32_t, Hash> Slots;
 
-std::vector<char> 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);
+Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirements, const std::string &key, const Slots &slots, uint32_t flags, bool platform, const Progress &progress);
 
 }