Verify we do not overflow annoying 0x3000 padding.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index b4d2ae5757639079b092cdc8afe08a0e483b88c2..b603bbd1c18aac4fe569c377fde701d44f385f1c 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -3,8 +3,10 @@
 
 #include <cstdlib>
 #include <map>
+#include <sstream>
 #include <streambuf>
 #include <string>
+#include <vector>
 
 namespace ldid {
 
@@ -47,9 +49,10 @@ FunctorImpl<decltype(&Function_::operator())> fun(const Function_ &value) {
 
 class Folder {
   public:
-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code) = 0;
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code) = 0;
-    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) = 0;
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) = 0;
+    virtual bool Look(const std::string &path) = 0;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) = 0;
+    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) = 0;
 };
 
 class DiskFolder :
@@ -61,37 +64,95 @@ class DiskFolder :
 
     std::string Path(const std::string &path);
 
-    void Find(const std::string &root, const std::string &base, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)>&code);
+    void Find(const std::string &root, const std::string &base, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link);
 
   public:
     DiskFolder(const std::string &path);
     ~DiskFolder();
 
-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
-    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Look(const std::string &path);
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code);
+    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link);
 };
 
 class SubFolder :
     public Folder
 {
   private:
-    Folder *parent_;
+    Folder &parent_;
     std::string path_;
 
   public:
-    SubFolder(Folder *parent, const std::string &path);
+    SubFolder(Folder &parent, const std::string &path);
 
-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
-    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Look(const std::string &path);
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code);
+    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link);
 };
 
-std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote);
+class UnionFolder :
+    public Folder
+{
+  private:
+    class StringBuffer :
+        public std::stringbuf
+    {
+      public:
+        StringBuffer() {
+        }
+
+        StringBuffer(const StringBuffer &rhs) :
+            std::stringbuf(rhs.str())
+        {
+        }
+    };
+
+    Folder &parent_;
+    std::set<std::string> deletes_;
+
+    std::map<std::string, std::string> remaps_;
+    std::map<std::string, std::pair<StringBuffer, const void *>> resets_;
+
+    std::string Map(const std::string &path);
+    void Map(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, const void *)> &)> &save);
+
+  public:
+    UnionFolder(Folder &parent);
+
+    virtual void Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Look(const std::string &path);
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code);
+    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link);
+
+    void operator ()(const std::string &from) {
+        deletes_.insert(from);
+    }
+
+    void operator ()(const std::string &from, const std::string &to) {
+        operator ()(from);
+        remaps_[to] = from;
+    }
+
+    std::stringbuf &operator ()(const std::string &from, const void *flag) {
+        operator ()(from);
+        auto &reset(resets_[from]);
+        reset.second = flag;
+        return reset.first;
+    }
+};
+
+struct Bundle {
+    std::string path;
+    std::vector<char> hash;
+};
+
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &entitlements, const std::string &requirement);
 
 typedef std::map<uint32_t, std::vector<char>> Slots;
 
-void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &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);
 
 }