The iOS package script installed ldid as ldid.arm.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 01f53b425ec41334f5dedb2cd7fb9a1dcc91291c..f561fa63ce0a6b32f8113628fdbbe0770eb52ab1 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1,39 +1,23 @@
 /* ldid - (Mach-O) Link-Loader Identity Editor
 /* ldid - (Mach-O) Link-Loader Identity Editor

- * Copyright (C) 2007-2010  Jay Freeman (saurik)
+ * Copyright (C) 2007-2012  Jay Freeman (saurik)

 */
 
 */
 

+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */

 
 #include "minimal/stdlib.h"
 #include "minimal/string.h"
 
 #include "minimal/stdlib.h"
 #include "minimal/string.h"


@@ -83,6 +67,7 @@ struct mach_header {
 
 #define MH_DYLDLINK   0x4
 
 
 #define MH_DYLDLINK   0x4
 

+#define MH_OBJECT     0x1

 #define MH_EXECUTE    0x2
 #define MH_DYLIB      0x6
 #define MH_BUNDLE     0x8
 #define MH_EXECUTE    0x2
 #define MH_DYLIB      0x6
 #define MH_BUNDLE     0x8


@@ -93,15 +78,21 @@ struct load_command {
     uint32_t cmdsize;
 } _packed;
 
     uint32_t cmdsize;
 } _packed;
 

-#define LC_REQ_DYLD  uint32_t(0x80000000)
-
-#define        LC_SEGMENT         uint32_t(0x01)
-#define        LC_SYMTAB          uint32_t(0x02)
-#define LC_LOAD_DYLIB      uint32_t(0x0c)
-#define LC_ID_DYLIB        uint32_t(0x0d)
-#define LC_UUID            uint32_t(0x1b)
-#define LC_CODE_SIGNATURE  uint32_t(0x1d)
-#define LC_REEXPORT_DYLIB  uint32_t(0x1f | LC_REQ_DYLD)
+#define LC_REQ_DYLD           uint32_t(0x80000000)
+
+#define LC_SEGMENT            uint32_t(0x01)
+#define LC_SYMTAB             uint32_t(0x02)
+#define LC_DYSYMTAB           uint32_t(0x0b)
+#define LC_LOAD_DYLIB         uint32_t(0x0c)
+#define LC_ID_DYLIB           uint32_t(0x0d)
+#define LC_SEGMENT_64         uint32_t(0x19)
+#define LC_UUID               uint32_t(0x1b)
+#define LC_CODE_SIGNATURE     uint32_t(0x1d)
+#define LC_SEGMENT_SPLIT_INFO uint32_t(0x1e)
+#define LC_REEXPORT_DYLIB     uint32_t(0x1f | LC_REQ_DYLD)
+#define LC_ENCRYPTION_INFO    uint32_t(0x21)
+#define LC_DYLD_INFO          uint32_t(0x22)
+#define LC_DYLD_INFO_ONLY     uint32_t(0x22 | LC_REQ_DYLD)

 
 struct dylib {
     uint32_t name;
 
 struct dylib {
     uint32_t name;


@@ -131,6 +122,91 @@ struct symtab_command {
     uint32_t strsize;
 } _packed;
 
     uint32_t strsize;
 } _packed;
 

+struct dyld_info_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint32_t rebase_off;
+    uint32_t rebase_size;
+    uint32_t bind_off;
+    uint32_t bind_size;
+    uint32_t weak_bind_off;
+    uint32_t weak_bind_size;
+    uint32_t lazy_bind_off;
+    uint32_t lazy_bind_size;
+    uint32_t export_off;
+    uint32_t export_size;
+} _packed;
+
+struct dysymtab_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint32_t ilocalsym;
+    uint32_t nlocalsym;
+    uint32_t iextdefsym;
+    uint32_t nextdefsym;
+    uint32_t iundefsym;
+    uint32_t nundefsym;
+    uint32_t tocoff;
+    uint32_t ntoc;
+    uint32_t modtaboff;
+    uint32_t nmodtab;
+    uint32_t extrefsymoff;
+    uint32_t nextrefsyms;
+    uint32_t indirectsymoff;
+    uint32_t nindirectsyms;
+    uint32_t extreloff;
+    uint32_t nextrel;
+    uint32_t locreloff;
+    uint32_t nlocrel;
+} _packed;
+
+struct dylib_table_of_contents {
+    uint32_t symbol_index;
+    uint32_t module_index;
+} _packed;
+
+struct dylib_module {
+    uint32_t module_name;
+    uint32_t iextdefsym;
+    uint32_t nextdefsym;
+    uint32_t irefsym;
+    uint32_t nrefsym;
+    uint32_t ilocalsym;
+    uint32_t nlocalsym;
+    uint32_t iextrel;
+    uint32_t nextrel;
+    uint32_t iinit_iterm;
+    uint32_t ninit_nterm;
+    uint32_t objc_module_info_addr;
+    uint32_t objc_module_info_size;
+} _packed;
+
+struct dylib_reference {
+    uint32_t isym:24;
+    uint32_t flags:8;
+} _packed;
+
+struct relocation_info {
+    int32_t r_address;
+    uint32_t r_symbolnum:24;
+    uint32_t r_pcrel:1;
+    uint32_t r_length:2;
+    uint32_t r_extern:1;
+    uint32_t r_type:4;
+} _packed;
+
+struct nlist {
+    union {
+        char *n_name;
+        int32_t n_strx;
+    } n_un;
+
+    uint8_t n_type;
+    uint8_t n_sect;
+    uint8_t n_desc;
+    uint32_t n_value;
+} _packed;
+

 struct segment_command {
     uint32_t cmd;
     uint32_t cmdsize;
 struct segment_command {
     uint32_t cmd;
     uint32_t cmdsize;


@@ -143,7 +219,21 @@ struct segment_command {
     uint32_t initprot;
     uint32_t nsects;
     uint32_t flags;
     uint32_t initprot;
     uint32_t nsects;
     uint32_t flags;

-};
+} _packed;
+
+struct segment_command_64 {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    char segname[16];
+    uint64_t vmaddr;
+    uint64_t vmsize;
+    uint64_t fileoff;
+    uint64_t filesize;
+    uint32_t maxprot;
+    uint32_t initprot;
+    uint32_t nsects;
+    uint32_t flags;
+} _packed;

 
 struct section {
     char sectname[16];
 
 struct section {
     char sectname[16];


@@ -157,7 +247,21 @@ struct section {
     uint32_t flags;
     uint32_t reserved1;
     uint32_t reserved2;
     uint32_t flags;
     uint32_t reserved1;
     uint32_t reserved2;

-};
+} _packed;
+
+struct section_64 {
+    char sectname[16];
+    char segname[16];
+    uint64_t addr;
+    uint64_t size;
+    uint32_t offset;
+    uint32_t align;
+    uint32_t reloff;
+    uint32_t nreloc;
+    uint32_t flags;
+    uint32_t reserved1;
+    uint32_t reserved2;
+} _packed;

 
 struct linkedit_data_command {
     uint32_t cmd;
 
 struct linkedit_data_command {
     uint32_t cmd;


@@ -166,6 +270,30 @@ struct linkedit_data_command {
     uint32_t datasize;
 } _packed;
 
     uint32_t datasize;
 } _packed;
 

+struct encryption_info_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint32_t cryptoff;
+    uint32_t cryptsize;
+    uint32_t cryptid;
+} _packed;
+
+#define BIND_OPCODE_MASK                             0xf0
+#define BIND_IMMEDIATE_MASK                          0x0f
+#define BIND_OPCODE_DONE                             0x00
+#define BIND_OPCODE_SET_DYLIB_ORDINAL_IMM            0x10
+#define BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB           0x20
+#define BIND_OPCODE_SET_DYLIB_SPECIAL_IMM            0x30
+#define BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM    0x40
+#define BIND_OPCODE_SET_TYPE_IMM                     0x50
+#define BIND_OPCODE_SET_ADDEND_SLEB                  0x60
+#define BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB      0x70
+#define BIND_OPCODE_ADD_ADDR_ULEB                    0x80
+#define BIND_OPCODE_DO_BIND                          0x90
+#define BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB            0xa0
+#define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED      0xb0
+#define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0
+

 uint16_t Swap_(uint16_t value) {
     return
         ((value >>  8) & 0x00ff) |
 uint16_t Swap_(uint16_t value) {
     return
         ((value >>  8) & 0x00ff) |


@@ -318,20 +446,35 @@ class MachHeader :
         return load_commands;
     }
 
         return load_commands;
     }
 

-    std::vector<segment_command *> GetSegments(const char *segment_name) {
+    std::vector<segment_command *> GetSegments(const char *segment_name) const {

         std::vector<struct segment_command *> segment_commands;
 
         std::vector<struct segment_command *> segment_commands;
 

-        _foreach (load_command, GetLoadCommands())
+        _foreach (load_command, GetLoadCommands()) {

             if (Swap(load_command->cmd) == LC_SEGMENT) {
                 segment_command *segment_command = reinterpret_cast<struct segment_command *>(load_command);
                 if (strncmp(segment_command->segname, segment_name, 16) == 0)
                     segment_commands.push_back(segment_command);
             }
             if (Swap(load_command->cmd) == LC_SEGMENT) {
                 segment_command *segment_command = reinterpret_cast<struct segment_command *>(load_command);
                 if (strncmp(segment_command->segname, segment_name, 16) == 0)
                     segment_commands.push_back(segment_command);
             }

+        }

 
         return segment_commands;
     }
 
 
         return segment_commands;
     }
 

-    std::vector<section *> GetSections(const char *segment_name, const char *section_name) {
+    std::vector<segment_command_64 *> GetSegments64(const char *segment_name) {
+        std::vector<struct segment_command_64 *> segment_commands;
+
+        _foreach (load_command, GetLoadCommands()) {
+            if (Swap(load_command->cmd) == LC_SEGMENT_64) {
+                segment_command_64 *segment_command = reinterpret_cast<struct segment_command_64 *>(load_command);
+                if (strncmp(segment_command->segname, segment_name, 16) == 0)
+                    segment_commands.push_back(segment_command);
+            }
+        }
+
+        return segment_commands;
+    }
+
+    std::vector<section *> GetSections(const char *segment_name, const char *section_name) const {

         std::vector<section *> sections;
 
         _foreach (segment, GetSegments(segment_name)) {
         std::vector<section *> sections;
 
         _foreach (segment, GetSegments(segment_name)) {


@@ -385,12 +528,30 @@ class MachHeader :
     }
 };
 
     }
 };
 

+class FatMachHeader :
+    public MachHeader
+{
+  private:
+    fat_arch *fat_arch_;
+
+  public:
+    FatMachHeader(void *base, size_t size, fat_arch *fat_arch) :
+        MachHeader(base, size),
+        fat_arch_(fat_arch)
+    {
+    }
+
+    fat_arch *GetFatArch() const {
+        return fat_arch_;
+    }
+};
+

 class FatHeader :
     public Data
 {
   private:
     fat_header *fat_header_;
 class FatHeader :
     public Data
 {
   private:
     fat_header *fat_header_;

-    std::vector<MachHeader> mach_headers_;
+    std::vector<FatMachHeader> mach_headers_;

 
   public:
     FatHeader(void *base, size_t size) :
 
   public:
     FatHeader(void *base, size_t size) :


@@ -403,7 +564,7 @@ class FatHeader :
             goto fat;
         } else if (Swap(fat_header_->magic) != FAT_MAGIC) {
             fat_header_ = NULL;
             goto fat;
         } else if (Swap(fat_header_->magic) != FAT_MAGIC) {
             fat_header_ = NULL;

-            mach_headers_.push_back(MachHeader(base, size));
+            mach_headers_.push_back(FatMachHeader(base, size, NULL));

         } else fat: {
             size_t fat_narch = Swap(fat_header_->nfat_arch);
             fat_arch *fat_arch = reinterpret_cast<struct fat_arch *>(fat_header_ + 1);
         } else fat: {
             size_t fat_narch = Swap(fat_header_->nfat_arch);
             fat_arch *fat_arch = reinterpret_cast<struct fat_arch *>(fat_header_ + 1);


@@ -411,24 +572,28 @@ class FatHeader :
             for (arch = 0; arch != fat_narch; ++arch) {
                 uint32_t arch_offset = Swap(fat_arch->offset);
                 uint32_t arch_size = Swap(fat_arch->size);
             for (arch = 0; arch != fat_narch; ++arch) {
                 uint32_t arch_offset = Swap(fat_arch->offset);
                 uint32_t arch_size = Swap(fat_arch->size);

-                mach_headers_.push_back(MachHeader((uint8_t *) base + arch_offset, size));
+                mach_headers_.push_back(FatMachHeader((uint8_t *) base + arch_offset, arch_size, fat_arch));

                 ++fat_arch;
             }
         }
     }
 
                 ++fat_arch;
             }
         }
     }
 

-    std::vector<MachHeader> &GetMachHeaders() {
+    std::vector<FatMachHeader> &GetMachHeaders() {

         return mach_headers_;
     }
 
     bool IsFat() const {
         return fat_header_ != NULL;
     }
         return mach_headers_;
     }
 
     bool IsFat() const {
         return fat_header_ != NULL;
     }

+
+    struct fat_header *operator ->() const {
+        return fat_header_;
+    }

 };
 
 };
 

-FatHeader Map(const char *path) {
+FatHeader Map(const char *path, bool ro = false) {

     size_t size;
     size_t size;

-    void *base(map(path, 0, _not(size_t), &size, false));
+    void *base(map(path, 0, _not(size_t), &size, ro));

     return FatHeader(base, size);
 }
 
     return FatHeader(base, size);
 }
 


@@ -547,6 +712,17 @@ int main(int argc, const char *argv[]) {
     bool flag_S(false);
     bool flag_s(false);
 
     bool flag_S(false);
     bool flag_s(false);
 

+    bool flag_O(false);
+
+    bool flag_D(false);
+    bool flag_d(false);
+
+    bool flag_A(false);
+    bool flag_a(false);
+
+    uint32_t flag_CPUType(_not(uint32_t));
+    uint32_t flag_CPUSubtype(_not(uint32_t));
+

     bool timeh(false);
     uint32_t timev(0);
 
     bool timeh(false);
     uint32_t timev(0);
 


@@ -577,6 +753,26 @@ int main(int argc, const char *argv[]) {
             case 'u': flag_u = true; break;
             case 'p': flag_p = true; break;
             case 'e': flag_e = true; break;
             case 'u': flag_u = true; break;
             case 'p': flag_p = true; break;
             case 'e': flag_e = true; break;

+            case 'O': flag_O = true; break;
+
+            case 'D': flag_D = true; break;
+            case 'd': flag_d = true; break;
+
+            case 'a': flag_a = true; break;
+
+            case 'A':
+                flag_A = true;
+                if (argv[argi][2] != '\0') {
+                    const char *cpu = argv[argi] + 2;
+                    const char *colon = strchr(cpu, ':');
+                    _assert(colon != NULL);
+                    char *arge;
+                    flag_CPUType = strtoul(cpu, &arge, 0);
+                    _assert(arge == colon);
+                    flag_CPUSubtype = strtoul(colon + 1, &arge, 0);
+                    _assert(arge == argv[argi] + strlen(argv[argi]));
+                }
+            break;

 
             case 's':
                 _assert(!flag_S);
 
             case 's':
                 _assert(!flag_S);


@@ -638,42 +834,63 @@ int main(int argc, const char *argv[]) {
         }
 
         if (flag_r) {
         }
 
         if (flag_r) {

-            size_t clip(_not(size_t)); {
+            uint32_t clip(0); {

                 FatHeader fat_header(Map(path));
                 _foreach (mach_header, fat_header.GetMachHeaders()) {
                 FatHeader fat_header(Map(path));
                 _foreach (mach_header, fat_header.GetMachHeaders()) {

+                    if (flag_A) {
+                        if (mach_header.GetCPUType() != flag_CPUType)
+                            continue;
+                        if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                            continue;
+                    }
+

                     mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
 
                     mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
 

-                    size_t size(_not(size_t)); {
+                    uint32_t size(_not(uint32_t)); {

                         _foreach (load_command, mach_header.GetLoadCommands()) {
                             switch (mach_header.Swap(load_command->cmd)) {
                                 case LC_CODE_SIGNATURE: {
                                     struct linkedit_data_command *signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
                         _foreach (load_command, mach_header.GetLoadCommands()) {
                             switch (mach_header.Swap(load_command->cmd)) {
                                 case LC_CODE_SIGNATURE: {
                                     struct linkedit_data_command *signature = reinterpret_cast<struct linkedit_data_command *>(load_command);

+                                    memset(reinterpret_cast<uint8_t *>(mach_header.GetBase()) + mach_header.Swap(signature->dataoff), 0, mach_header.Swap(signature->datasize));

                                     memset(signature, 0, sizeof(struct linkedit_data_command));
 
                                     memset(signature, 0, sizeof(struct linkedit_data_command));
 

-                                    mach_header->ncmds -= 1;
-                                    mach_header->sizeofcmds -= sizeof(struct linkedit_data_command);
+                                    mach_header->ncmds = mach_header.Swap(mach_header.Swap(mach_header->ncmds) - 1);
+                                    mach_header->sizeofcmds = mach_header.Swap(uint32_t(mach_header.Swap(mach_header->sizeofcmds) - sizeof(struct linkedit_data_command)));

                                 } break;
 
                                 case LC_SYMTAB: {
                                     struct symtab_command *symtab = reinterpret_cast<struct symtab_command *>(load_command);
                                 } break;
 
                                 case LC_SYMTAB: {
                                     struct symtab_command *symtab = reinterpret_cast<struct symtab_command *>(load_command);

-                                    size = symtab->stroff + symtab->strsize;
+                                    size = mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize);

                                 } break;
                             }
                         }
                                 } break;
                             }
                         }

+                    }

 
 

-                        _foreach (segment, const_cast<MachHeader &>(mach_header).GetSegments("__LINKEDIT")) {
-                            segment->filesize -= mach_header.GetSize() - size;
+                    _assert(size != _not(uint32_t));

 
 

-                            if (!fat_header.IsFat())
-                                clip = size;
-                            else
-                                _assert(false);
-                        }
+                    _foreach (segment, const_cast<FatMachHeader &>(mach_header).GetSegments("__LINKEDIT")) {
+                        segment->filesize -= mach_header.GetSize() - size;
+
+                        if (fat_arch *fat_arch = mach_header.GetFatArch()) {
+                            fat_arch->size = fat_header.Swap(size);
+                            clip = std::max(clip, fat_header.Swap(fat_arch->offset) + size);
+                        } else
+                            clip = std::max(clip, size);
+                    }
+
+                    _foreach (segment, const_cast<FatMachHeader &>(mach_header).GetSegments64("__LINKEDIT")) {
+                        segment->filesize -= mach_header.GetSize() - size;
+
+                        if (fat_arch *fat_arch = mach_header.GetFatArch()) {
+                            fat_arch->size = fat_header.Swap(size);
+                            clip = std::max(clip, fat_header.Swap(fat_arch->offset) + size);
+                        } else
+                            clip = std::max(clip, size);

                     }
                 }
             }
 
                     }
                 }
             }
 

-            if (clip != _not(size_t))
+            if (clip != 0)

                 _syscall(truncate(path, clip));
         }
 
                 _syscall(truncate(path, clip));
         }
 


@@ -686,6 +903,13 @@ int main(int argc, const char *argv[]) {
             std::vector<CodesignAllocation> allocations; {
                 FatHeader fat_header(Map(path));
                 _foreach (mach_header, fat_header.GetMachHeaders()) {
             std::vector<CodesignAllocation> allocations; {
                 FatHeader fat_header(Map(path));
                 _foreach (mach_header, fat_header.GetMachHeaders()) {

+                    if (flag_A) {
+                        if (mach_header.GetCPUType() != flag_CPUType)
+                            continue;
+                        if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                            continue;
+                    }
+

                     mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
 
                     size_t size(_not(size_t)); {
                     mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
 
                     size_t size(_not(size_t)); {


@@ -707,6 +931,8 @@ int main(int argc, const char *argv[]) {
                 }
             }
 
                 }
             }
 

+            if (!allocations.empty()) {
+

             pid_t pid = fork();
             _syscall(pid);
             if (pid == 0) {
             pid_t pid = fork();
             _syscall(pid);
             if (pid == 0) {


@@ -755,7 +981,7 @@ int main(int argc, const char *argv[]) {
                     alloc /= 16;
                     alloc *= 16;
 
                     alloc /= 16;
                     alloc *= 16;
 

-                    asprintf(&arg, "%u", alloc);
+                    asprintf(&arg, "%zu", alloc);

                     args.push_back(arg);
                 }
 
                     args.push_back(arg);
                 }
 


@@ -779,15 +1005,34 @@ int main(int argc, const char *argv[]) {
             _syscall(waitpid(pid, &status, 0));
             _assert(WIFEXITED(status));
             _assert(WEXITSTATUS(status) == 0);
             _syscall(waitpid(pid, &status, 0));
             _assert(WIFEXITED(status));
             _assert(WEXITSTATUS(status) == 0);

+
+            }

         }
 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file.c_str());
 
         }
 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file.c_str());
 

-        FatHeader fat_header(Map(temp == NULL ? path : temp));
+        FatHeader fat_header(Map(temp == NULL ? path : temp, !(flag_R || flag_T || flag_s || flag_S || flag_O || flag_D)));

         struct linkedit_data_command *signature(NULL);
 
         _foreach (mach_header, fat_header.GetMachHeaders()) {
         struct linkedit_data_command *signature(NULL);
 
         _foreach (mach_header, fat_header.GetMachHeaders()) {

+            if (flag_A) {
+                if (mach_header.GetCPUType() != flag_CPUType)
+                    continue;
+                if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                    continue;
+            }
+
+            if (flag_a)
+                printf("cpu=0x%x:0x%x\n", mach_header.GetCPUType(), mach_header.GetCPUSubtype());
+
+            if (flag_d) {
+                if (struct fat_arch *fat_arch = mach_header.GetFatArch())
+                    printf("offset=0x%x\n", Swap(fat_arch->offset));
+                else
+                    printf("offset=0x0\n");
+            }
+

             if (woffset != _not(uintptr_t)) {
                 Pointer<uint32_t> wvalue(mach_header.GetPointer<uint32_t>(woffset));
                 if (wvalue == NULL)
             if (woffset != _not(uintptr_t)) {
                 Pointer<uint32_t> wvalue(mach_header.GetPointer<uint32_t>(woffset));
                 if (wvalue == NULL)


@@ -799,6 +1044,17 @@ int main(int argc, const char *argv[]) {
             if (noffset != _not(uintptr_t))
                 printf("%s\n", &*mach_header.GetPointer<char>(noffset));
 
             if (noffset != _not(uintptr_t))
                 printf("%s\n", &*mach_header.GetPointer<char>(noffset));
 

+            if (flag_d)
+                _foreach(segment, mach_header.GetSegments("__TEXT")) {
+                    printf("vmaddr=0x%x\n", mach_header.Swap(segment->vmaddr));
+                    printf("fileoff=0x%x\n", mach_header.Swap(segment->fileoff));
+                }
+
+            if (flag_O) {
+                _foreach(section, mach_header.GetSections("__TEXT", "__text"))
+                    section->addr = mach_header.Swap(0);
+            }
+

             _foreach (load_command, mach_header.GetLoadCommands()) {
                 uint32_t cmd(mach_header.Swap(load_command->cmd));
 
             _foreach (load_command, mach_header.GetLoadCommands()) {
                 uint32_t cmd(mach_header.Swap(load_command->cmd));
 


@@ -835,6 +1091,17 @@ int main(int argc, const char *argv[]) {
 
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }
 
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }

+                } else if (cmd == LC_ENCRYPTION_INFO) {
+                    volatile struct encryption_info_command *encryption_info_command(reinterpret_cast<struct encryption_info_command *>(load_command));
+
+                    if (flag_D)
+                        encryption_info_command->cryptid = mach_header.Swap(0);
+
+                    if (flag_d) {
+                        printf("cryptoff=0x%x\n", mach_header.Swap(encryption_info_command->cryptoff));
+                        printf("cryptsize=0x%x\n", mach_header.Swap(encryption_info_command->cryptsize));
+                        printf("cryptid=0x%x\n", mach_header.Swap(encryption_info_command->cryptid));
+                    }

                 }
             }
 
                 }
             }
 


@@ -842,7 +1109,6 @@ int main(int argc, const char *argv[]) {
                 _assert(signature != NULL);
 
                 uint32_t data = mach_header.Swap(signature->dataoff);
                 _assert(signature != NULL);
 
                 uint32_t data = mach_header.Swap(signature->dataoff);

-                uint32_t size = mach_header.Swap(signature->datasize);

 
                 uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
                 uint8_t *blob = top + data;
 
                 uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
                 uint8_t *blob = top + data;


@@ -860,7 +1126,6 @@ int main(int argc, const char *argv[]) {
                 _assert(signature != NULL);
 
                 uint32_t data = mach_header.Swap(signature->dataoff);
                 _assert(signature != NULL);
 
                 uint32_t data = mach_header.Swap(signature->dataoff);

-                uint32_t size = mach_header.Swap(signature->datasize);

 
                 uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
                 uint8_t *blob = top + data;
 
                 uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
                 uint8_t *blob = top + data;