UnionFolder clobbered sub-paths in nested bundles.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index b7bbdaf8b25041182680bd09de72bdfc5f8c525a..40b1c8b1dd13417ec18c91b3c57583bc12e3b0de 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 {
 
@@ -91,8 +93,21 @@ class UnionFolder :
     public Folder
 {
   private:
+    class StringBuffer :
+        public std::stringbuf
+    {
+      public:
+        StringBuffer() {
+        }
+
+        StringBuffer(const StringBuffer &rhs) :
+            std::stringbuf(rhs.str())
+        {
+        }
+    };
+
     Folder &parent_;
-    std::map<std::string, std::stringbuf> files_;
+    std::map<std::string, StringBuffer> files_;
 
   public:
     UnionFolder(Folder &parent);
@@ -106,7 +121,7 @@ class UnionFolder :
     }
 };
 
-std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote);
+std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote, const std::string &entitlements);
 
 typedef std::map<uint32_t, std::vector<char>> Slots;