WebSVN – QNX 8.QNX8 IFS tool – Diff – //ifstool.c

 #define PATH_SEP_STR ":"
 #endif // _WIN32
 #define RECORD_SEP '\x1e' // ASCII record separator
 #define RECORD_SEP_STR "\x1e" // ASCII record separator (as string)
+// macros for accessing ELF files
 #define ELF_MAGIC_STR "\x7f" "ELF"
 #define ELF_ENDIAN_LITTLE 1 // ELF file is little endian
 #define ELF_ENDIAN_BIG    2 // ELF file is big endian
 #define ELF_DT_NULL    0 // marks end of dynamic section
 #define ELF_DT_SONAME 14 // canonical name of shared object
+#define ELF_STRUCT_MEMBER_NUMERIC(elfhdr,elfstruct,member) ((elfhdr)->u.elf.platform_size == 2 ? /* is it a 64-bit ELF file ? */ \
+   ( \
-#define ELF_HDR_MEMBER(hdr,member) ((hdr)->u.elf.platform_size == 2 ? (hdr)->u.elf64.member : (hdr)->u.elf32.member) // this macro supports 32- and 64-bit ELF files transparently (FIXME: support foreign endianness as well)
+      (sizeof ((elfstruct)->u.elf64.member) == 1) || (((elfhdr)->u.elf.endianness == 1) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (((elfhdr)->u.elf.endianness == 2) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) ? /* single-byte, or same endianness ? */ \
+         (elfstruct)->u.elf64.member /* same endianness, or single byte required: don't swap */ \
+      : /* else */ \
-#define ELF_STRUCT_MEMBER(hdr,structure,member) ((hdr)->u.elf.platform_size == 2 ? (structure)->u.elf64.member : (structure)->u.elf32.member) // this macro supports 32- and 64-bit ELF files transparently (FIXME: support foreign endianness as well)
+         (sizeof ((elfstruct)->u.elf64.member) == 8 ? __builtin_bswap64 ((elfstruct)->u.elf64.member) : (sizeof ((elfstruct)->u.elf64.member) == 4 ? __builtin_bswap32 ((elfstruct)->u.elf64.member) : __builtin_bswap16 ((elfstruct)->u.elf64.member))) /* different endianness: swap */ \
+   ) \
+   : /* else peek at 32-bit ELF */ \
+   ( \
-#define ELF_STRUCT_SIZE(hdr,structure) ((hdr)->u.elf.platform_size == 2 ? sizeof ((structure)->u.elf64) : sizeof ((structure)->u.elf32)) // this macro supports 32- and 64-bit ELF files transparently (FIXME: support foreign endianness as well)
+      (sizeof ((elfstruct)->u.elf32.member) == 1) || (((elfhdr)->u.elf.endianness == 1) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (((elfhdr)->u.elf.endianness == 2) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) ? /* single-byte, or same endianness ? */ \
+         (elfstruct)->u.elf32.member /* same endianness, or single byte required: don't swap */ \
+      : /* else */ \
+         (sizeof ((elfstruct)->u.elf32.member) == 4 ? __builtin_bswap32 ((elfstruct)->u.elf32.member) : __builtin_bswap16 ((elfstruct)->u.elf32.member)) /* different endianness: swap */ \
+   ) \
+) // this macro supports 32- and 64-bit ELF files in low and big endianness transparently
+#define ELF_STRUCT_MEMBER_STRING(elfhdr,elfstruct,member) ((elfhdr)->u.elf.platform_size == 2 ? (elfstruct)->u.elf64.member : (elfstruct)->u.elf32.member) // this macro supports 32- and 64-bit ELF files transparently
+#define ELF_STRUCT_SIZE(elfhdr,elfstruct) ((elfhdr)->u.elf.platform_size == 2 ? sizeof ((elfstruct)->u.elf64) : sizeof ((elfstruct)->u.elf32)) // this macro supports 32- and 64-bit ELF files transparently
 #define WILL_BE_FILLED_LATER 0xbaadf00d
 // bitmapped flags used in the flags1 member of the startup header
          if (entry_parms->mtime == UINT32_MAX)
             entry_parms->mtime = (uint32_t) stat_buf.st_mtime;
          fprintf (stderr, "file: ino 0x%x uid %d gid %d mode 0%o path \"%s\" buildhost_file \"%s\" (len %zd)\n", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname, buildhost_pathname, entry_parms->datalen);
+      }
-      // is the file we're storing a dylib and should we check for its canonical name ? FIXME: support for big endian is wrong. We should swap only if endianness is foreign, and also swap all ELF struct members below.
+      // is the file we're storing an ELF file ?
       if ((entry_parms->datalen > 52) // file is big enough to contain an ELF header
           && ((elf = (elf_header_t *) entry_parms->data) != NULL) // cast (necessary true)
-          && (memcmp (ELF_HDR_MEMBER (elf, magic), ELF_MAGIC_STR, 4) == 0) // file starts with the ELF magic
+          && (memcmp (ELF_STRUCT_MEMBER_STRING (elf, elf, magic), ELF_MAGIC_STR, 4) == 0)) // file starts with the ELF magic
-          && (   ((ELF_HDR_MEMBER (elf, endianness) == ELF_ENDIAN_LITTLE) && (ELF_HDR_MEMBER (elf, type) == 3)) // file is little endian (offset 5) AND relocatable executable (i.e. a dynamic library)
-              || ((ELF_HDR_MEMBER (elf, endianness) == ELF_ENDIAN_BIG)    && (__builtin_bswap16 (ELF_HDR_MEMBER (elf, type)) == 3))) // file is big endian (offset 5) AND relocatable executable (i.e. a dynamic library)
-          && entry_parms->should_autosymlink_dylib) // we should store it under its official .so name
+      {
-         // we need to find the SONAME of this library
+         shdr_shstr = (elf_section_header_t *) &entry_parms->data[ELF_STRUCT_MEMBER_NUMERIC (elf, elf, section_header_table_offset) + (size_t) ELF_STRUCT_MEMBER_NUMERIC (elf, elf, section_header_item_size) * ELF_STRUCT_MEMBER_NUMERIC (elf, elf, section_header_names_idx)]; // quick access to section header for the section that contains the section names
-         canonical_dylib_name = NULL;
+         shtable_strings = &entry_parms->data[ELF_STRUCT_MEMBER_NUMERIC (elf, shdr_shstr, file_offset)]; // locate the start of the strings table that contains the section names
-         shdr_shstr = (elf_section_header_t *) &entry_parms->data[ELF_HDR_MEMBER (elf, section_header_table_offset) + (size_t) ELF_HDR_MEMBER (elf, section_header_item_size) * ELF_HDR_MEMBER (elf, section_header_names_idx)]; // quick access to section header for the section that contains the section names
+         // strip this ELF file
-         shtable_strings = &entry_parms->data[ELF_STRUCT_MEMBER (elf, shdr_shstr, file_offset)]; // locate the start of the strings table that contains the section names
-         // locate the sections we need (the dynamic section and its strings table)
+         // is the file we're storing a relocatable executable (i.e. a dynamic library) and should we check for its canonical name ?
-         table_count = ELF_HDR_MEMBER (elf, section_header_table_len);
+         if ((ELF_STRUCT_MEMBER_NUMERIC (elf, elf, type) == 3) && entry_parms->should_autosymlink_dylib)
-         shdr_dynamic = NULL;
-         shdr_dynstr = NULL;
-         for (table_index = 0; table_index < table_count; table_index++)
+         {
-            shdr = (elf_section_header_t *) &entry_parms->data[ELF_HDR_MEMBER (elf, section_header_table_offset) + (size_t) ELF_HDR_MEMBER (elf, section_header_item_size) * table_index]; // quick access to section header
-            elf_section_name = &shtable_strings[ELF_STRUCT_MEMBER (elf, shdr, name_offset)];
-            if (strcmp (elf_section_name, ".dynamic") == 0)
+            // we need to find the SONAME of this library
-               shdr_dynamic = shdr;
+            canonical_dylib_name = NULL;
-            else if (strcmp (elf_section_name, ".dynstr") == 0)
-               shdr_dynstr = shdr;
-         }
-         // make sure we have both the dynamic section header and its own strings table header
+            // locate the sections we need (the dynamic section and its strings table)
+            table_count = ELF_STRUCT_MEMBER_NUMERIC (elf, elf, section_header_table_len);
+            shdr_dynamic = NULL;
-         if ((shdr_dynamic != NULL) && (shdr_dynstr != NULL))
+            shdr_dynstr = NULL;
+            for (table_index = 0; table_index < table_count; table_index++)
-         {
+            {
-            dynamic_strings = (char *) &entry_parms->data[ELF_STRUCT_MEMBER (elf, shdr_dynstr, file_offset)]; // quick access to dynamic sections strings table
+               shdr = (elf_section_header_t *) &entry_parms->data[ELF_STRUCT_MEMBER_NUMERIC (elf, elf, section_header_table_offset) + (size_t) ELF_STRUCT_MEMBER_NUMERIC (elf, elf, section_header_item_size) * table_index]; // quick access to section header
+               elf_section_name = &shtable_strings[ELF_STRUCT_MEMBER_NUMERIC (elf, shdr, name_offset)];
+               if (strcmp (elf_section_name, ".dynamic") == 0)
+                  shdr_dynamic = shdr;
+               else if (strcmp (elf_section_name, ".dynstr") == 0)
+                  shdr_dynstr = shdr;
+            }
-            // walk through the dynamic section, look for the DT_SONAME entry
+            // make sure we have both the dynamic section header and its own strings table header
-            for (dynamic_entry = (elf_dynamic_section_entry_t *) &entry_parms->data[ELF_STRUCT_MEMBER (elf, shdr_dynamic, file_offset)];
-                 (ELF_STRUCT_MEMBER (elf, dynamic_entry, tag) != ELF_DT_NULL);
-                 dynamic_entry = (elf_dynamic_section_entry_t *) ((uint8_t *) dynamic_entry + ELF_STRUCT_SIZE (elf, dynamic_entry)))
-               if (ELF_STRUCT_MEMBER (elf, dynamic_entry, tag) == ELF_DT_SONAME)
-               {
-                  canonical_dylib_name = dynamic_strings + ELF_STRUCT_MEMBER (elf, dynamic_entry, value.as_integer);
-                  break;
-               }
-            // do we have it ?
-            if ((canonical_dylib_name != NULL) && (canonical_dylib_name[0] != 0))
+            if ((shdr_dynamic != NULL) && (shdr_dynstr != NULL))
+            {
+               dynamic_strings = (char *) &entry_parms->data[ELF_STRUCT_MEMBER_NUMERIC (elf, shdr_dynstr, file_offset)]; // quick access to dynamic sections strings table
+               // walk through the dynamic section, look for the DT_SONAME entry
+               for (dynamic_entry = (elf_dynamic_section_entry_t *) &entry_parms->data[ELF_STRUCT_MEMBER_NUMERIC (elf, shdr_dynamic, file_offset)];
-               sprintf (candidate_pathname, "%s/%s", entry_parms->prefix, canonical_dylib_name);
+                    (ELF_STRUCT_MEMBER_NUMERIC (elf, dynamic_entry, tag) != ELF_DT_NULL);
+                    dynamic_entry = (elf_dynamic_section_entry_t *) ((uint8_t *) dynamic_entry + ELF_STRUCT_SIZE (elf, dynamic_entry)))
+                  if (ELF_STRUCT_MEMBER_NUMERIC (elf, dynamic_entry, tag) == ELF_DT_SONAME)
+                  {
+                     canonical_dylib_name = dynamic_strings + ELF_STRUCT_MEMBER_NUMERIC (elf, dynamic_entry, value.as_integer);
+                     break;
+                  }
+               // do we have it ?
-               if (strcmp (candidate_pathname, stored_pathname) != 0) // claimed dylib name differs from passed name ?
+               if ((canonical_dylib_name != NULL) && (canonical_dylib_name[0] != 0))
+               {
+                  sprintf (candidate_pathname, "%s/%s", entry_parms->prefix, canonical_dylib_name);
+                  if (strcmp (candidate_pathname, stored_pathname) != 0) // claimed dylib name differs from passed name ?
+                  {
-                  original_stored_pathname = stored_pathname; // if so, remember to create a symlink here
+                     original_stored_pathname = stored_pathname; // if so, remember to create a symlink here
-                  stored_pathname = candidate_pathname;
+                     stored_pathname = candidate_pathname;
+                  }
+               }
+            }
-         }
+         } // end if the file we're storing is a dylib
-      }
+      } // end if the file we're storing is an ELF file
+   }
    else if (S_ISLNK (entry_parms->st_mode)) // else are we storing a symbolic link ?
       fprintf (stderr, "symlink: ino 0x%x uid %d gid %d mode 0%o path \"%s\" -> \"%s\"\n", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname, entry_parms->data);
    else // we must be storing a FIFO
+   {
                sprintf (&recorded_sha512[2 * byte_index], "%02x", startup_trailer_v2->sha512[byte_index]);
             strcpy (computed_sha512, SHA512 (startup_header, startuptrailer_offset - startupheader_offset, NULL));
             recorded_checksum = startup_trailer_v2->cksum;
             computed_checksum = update_checksum (startup_header, startuptrailer_offset + SHA512_DIGEST_LENGTH - startupheader_offset, is_foreign_endianness);
             printf ("    sha512([0x%zx-0x%zx[) = %s - %s\n", startupheader_offset, startuptrailer_offset, recorded_sha512, (strcasecmp (computed_sha512, recorded_sha512) == 0 ? "GOOD" : "BAD"));
-            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x (%d) - %s\n", startupheader_offset, startuptrailer_offset + SHA512_DIGEST_LENGTH, recorded_checksum, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
+            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x - %s\n", startupheader_offset, startuptrailer_offset + SHA512_DIGEST_LENGTH, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
             if (strcasecmp (computed_sha512, recorded_sha512) != 0)
                printf ("Computed SHA-512: %s\n", computed_sha512);
             if (computed_checksum != recorded_checksum)
-               printf ("Computed cksum: 0x%08x (%d)\n", computed_checksum, computed_checksum);
+               printf ("Computed cksum: 0x%08x\n", computed_checksum);
+         }
          else // old v1 trailer
+         {
             recorded_checksum = startup_trailer_v1->cksum;
             computed_checksum = update_checksum (startup_header, sizeof (startup_header) + startupfile_blobsize, is_foreign_endianness);
-            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x (%d) - %s\n", startupheader_offset, startuptrailer_offset, recorded_checksum, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
+            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x - %s\n", startupheader_offset, startuptrailer_offset, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
             if (computed_checksum != recorded_checksum)
-               printf ("Computed cksum: 0x%08x (%d)\n", computed_checksum, computed_checksum);
+               printf ("Computed cksum: 0x%08x\n", computed_checksum);
+         }
          current_offset += (startup_header->flags1 & STARTUP_HDR_FLAGS1_TRAILER_V2 ? sizeof (startup_trailer_v2_t) : sizeof (startup_trailer_v1_t)); // now reach the next segment
+      }
                sprintf (&recorded_sha512[2 * byte_index], "%02x", image_trailer_v2->sha512[byte_index]);
             strcpy (computed_sha512, SHA512 (image_header, imagetrailer_offset - imageheader_offset, NULL));
             recorded_checksum = image_trailer_v2->cksum;
             computed_checksum = update_checksum (image_header, imagetrailer_offset + SHA512_DIGEST_LENGTH - imageheader_offset, is_foreign_endianness);
             printf ("    sha512([0x%zx-0x%zx[) = %s - %s\n", imageheader_offset, imagetrailer_offset, recorded_sha512, (strcasecmp (computed_sha512, recorded_sha512) == 0 ? "GOOD" : "BAD"));
-            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x (%d) - %s\n", imageheader_offset, imagetrailer_offset + SHA512_DIGEST_LENGTH, recorded_checksum, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
+            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x - %s\n", imageheader_offset, imagetrailer_offset + SHA512_DIGEST_LENGTH, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
             if (strcasecmp (computed_sha512, recorded_sha512) != 0)
                printf ("Computed SHA-512: %s\n", computed_sha512);
             if (computed_checksum != recorded_checksum)
-               printf ("Computed cksum: 0x%08x (%d)\n", computed_checksum, computed_checksum);
+               printf ("Computed cksum: 0x%08x\n", computed_checksum);
+         }
          else // old v1 trailer
+         {
             recorded_checksum = image_trailer_v1->cksum;
             computed_checksum = update_checksum (image_header, image_header->image_size - sizeof (image_trailer_v1_t), is_foreign_endianness);
-            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x (%d) - %s\n", imageheader_offset, imagetrailer_offset, recorded_checksum, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
+            printf ("    cksum([0x%zx-0x%zx[) = 0x%08x - %s\n", imageheader_offset, imagetrailer_offset, recorded_checksum, (computed_checksum == recorded_checksum ? "GOOD" : "BAD"));
             if (computed_checksum != recorded_checksum)
-               printf ("Computed cksum: 0x%08x (%d)\n", computed_checksum, computed_checksum);
+               printf ("Computed cksum: 0x%08x\n", computed_checksum);
+         }
          current_offset += (image_header->flags & IMAGE_FLAGS_TRAILER_V2 ? sizeof (image_trailer_v2_t) : sizeof (image_trailer_v1_t)); // now reach the next segment (typically end of file)
+      }

Subversion Repositories QNX 8.QNX8 IFS tool

QNX 8.QNX8 IFS tool//ifstool.c – Rev 8 → 9