Fix -S -M and -s on .app bundles (Closes #18)

diff --git a/ldid.cpp b/ldid.cpp
index 1703da026ef65d06dc2f1e8c4e77228a1540f979..9a9339b916da0777baa0c5e76801f488439a5ffd 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -2822,7 +2822,7 @@ struct State {
     }
 };
 
     }
 };
 

-Bundle Sign(const std::string &root, Folder &parent, const std::string &key, State &local, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress) {
+Bundle Sign(const std::string &root, Folder &parent, const std::string &key, State &local, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, bool merge, const Progress &progress) {

     std::string executable;
     std::string identifier;
 
     std::string executable;
     std::string identifier;
 


@@ -2930,7 +2930,7 @@ Bundle Sign(const std::string &root, Folder &parent, const std::string &key, Sta
         State remote;
         bundles[nested[1]] = Sign(root + bundle, subfolder, key, remote, "", Starts(name, "PlugIns/") ? alter :
             static_cast<const Functor<std::string (const std::string &, const std::string &)> &>(fun([&](const std::string &, const std::string &) -> std::string { return entitlements; }))
         State remote;
         bundles[nested[1]] = Sign(root + bundle, subfolder, key, remote, "", Starts(name, "PlugIns/") ? alter :
             static_cast<const Functor<std::string (const std::string &, const std::string &)> &>(fun([&](const std::string &, const std::string &) -> std::string { return entitlements; }))

-        , progress);
+        , merge, progress);

         local.Merge(bundle, remote);
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
     }));
         local.Merge(bundle, remote);
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
     }));


@@ -3114,16 +3114,16 @@ Bundle Sign(const std::string &root, Folder &parent, const std::string &key, Sta
             Slots slots;
             slots[1] = local.files.at(info);
             slots[3] = local.files.at(signature);
             Slots slots;
             slots[1] = local.files.at(info);
             slots[3] = local.files.at(signature);

-            bundle.hash = Sign(NULL, 0, buffer, local.files[executable], save, identifier, entitlements, false, requirements, key, slots, length, 0, false, Progression(progress, root + executable));
+            bundle.hash = Sign(NULL, 0, buffer, local.files[executable], save, identifier, entitlements, merge, requirements, key, slots, length, 0, false, Progression(progress, root + executable));

         }));
     }));
 
     return bundle;
 }
 
         }));
     }));
 
     return bundle;
 }
 

-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) {
+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, bool merge, const Progress &progress) {

     State local;
     State local;

-    return Sign(root, folder, key, local, requirements, alter, progress);
+    return Sign(root, folder, key, local, requirements, alter, merge, progress);

 }
 
 #endif
 }
 
 #endif


@@ -3434,13 +3434,13 @@ int main(int argc, char *argv[]) {
         }
 
         if (S_ISDIR(info.st_mode)) {
         }
 
         if (S_ISDIR(info.st_mode)) {

-            if (!flag_S) {
-                fprintf(stderr, "ldid: Only -S can be used on directories\n");
+            if (!flag_S && !flag_s) {
+                fprintf(stderr, "ldid: Only -S and -s can be used on directories\n");

                 exit(1);
             }
             ldid::DiskFolder folder(path + "/");
                 exit(1);
             }
             ldid::DiskFolder folder(path + "/");

-            path += "/" + Sign("", folder, key, requirements, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; }), dummy_).path;
-        } else if (flag_S || flag_r) {
+            path += "/" + Sign("", folder, key, requirements, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; }), flag_M, dummy_).path;
+        } else if (flag_S || flag_r || flag_s) {

             Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE);
 
             std::filebuf output;
             Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE);
 
             std::filebuf output;

diff --git a/ldid.hpp b/ldid.hpp
index 1e46f56dfb595149c1e2e26f329ff6736995fec3..ef7747793859bd0cf9d959ff03a73d2d80c7b201 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -157,7 +157,7 @@ struct Bundle {
     Hash hash;
 };
 
     Hash hash;
 };
 

-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);
+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, bool merge, const Progress &progress);

 
 typedef std::map<uint32_t, Hash> Slots;
 
 
 typedef std::map<uint32_t, Hash> Slots;