Changeset 82809

Timestamp:

08/20/11 16:43:32 (4 years ago)

Author:

fotanus@…

Message:

fix bug on list_dlibs

Location:

branches/gsoc11-post-destroot/base/src/pextlib1.0

Files:

• macho.c (modified) (5 diffs)
• tests/macho.tcl (modified) (1 diff)

branches/gsoc11-post-destroot/base/src/pextlib1.0/macho.c

@@ -86 +86 @@
 
 Tcl_Obj * check_magic(const uint32_t magic, macho_input_t **input, bool * universal, uint32_t (**swap32)(uint32_t), const struct mach_header ** header, const struct fat_header ** fat_header, size_t * header_size){
+        const struct mach_header_64 *header64;
         switch (magic) {
                 case MH_CIGAM:
-                case MH_CIGAM_64:
                         *swap32 = macho_swap32;
                         /* Fall-through */
 
                 case MH_MAGIC:
-                case MH_MAGIC_64:
                         *header_size = sizeof(**header);
                         *header = macho_read(*input, (*input)->data, *header_size);
@@ -101 +100 @@
                         break;
 
+                case MH_CIGAM_64:
+                        *swap32 = macho_swap32;
+                        /* Fall-through */
+
+                case MH_MAGIC_64:
+                        *header_size = sizeof(*header64);
+                        header64 = macho_read(*input, (*input)->data, sizeof(*header64));
+                        if (header64 == NULL)
+                                return (Tcl_Obj *)TCL_ERROR;
+
+                        /* The 64-bit header is a direct superset of the 32-bit header */
+                        *header = (struct mach_header *) header64;
+                        break;
+
                 case FAT_CIGAM:
                 case FAT_MAGIC:
@@ -137 +150 @@
                 return (Tcl_Obj *)TCL_ERROR;
 
-
         /* Check file header magic */
         if(check_magic(*magic, &input, &universal, &swap32, &header, &fat_header, &header_size) == (Tcl_Obj *)TCL_ERROR){
@@ -153 +165 @@
         /* Parse the Mach-O load commands */
         cmd = macho_offset(input, header, header_size, sizeof(struct load_command));
-        if (cmd == NULL)
-                return (Tcl_Obj *)TCL_ERROR;
+        if (cmd == NULL){
+                return (Tcl_Obj *)TCL_ERROR;
+        }
         ncmds = swap32(header->ncmds);
 
@@ -239 +252 @@
 Tcl_Obj * list_macho_archs_l(macho_input_t *input, Tcl_Interp *interp, Tcl_Obj * archs_list) {
         const struct mach_header *header;
-        const struct mach_header_64 *header64;
         size_t header_size;
         const NXArchInfo *archInfo;

branches/gsoc11-post-destroot/base/src/pextlib1.0/tests/macho.tcl

@@ -3 +3 @@
 
         set test_file /bin/sh
+        #set test_file /opt/local/lib/libevent_pthreads-2.0.5.dylib
         set archs [list_archs $test_file]
         set libs [list_dlibs $test_file]