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

    ((bootargs_entry_t *) bootargs_buffer.bytes)->argc = (uint8_t) exe_cmdline->count;
    ((bootargs_entry_t *) bootargs_buffer.bytes)->envc = (uint8_t) exe_env->count;
    ((bootargs_entry_t *) bootargs_buffer.bytes)->shdr_addr = WILL_BE_FILLED_LATER; // same value as startup_header.image_paddr (which is not set yet) (TODO: support 64-bit shdr_addr offsets -- see comment in bootargs_entry_t struct)
    for (array_index = 0; array_index < exe_cmdline->count; array_index++)
       ASSERT_WITH_ERRNO (Buffer_Append (&bootargs_buffer, exe_cmdline->args[array_index], strlen (exe_cmdline->args[array_index]) + 1)); // append string including NUL terminator
-   for (array_index = 0; array_index < global_envp.count; array_index++)
-      ASSERT_WITH_ERRNO (Buffer_Append (&bootargs_buffer, global_envp.args[array_index], strlen (global_envp.args[array_index]) + 1)); // append string including NUL terminator
    for (array_index = 0; array_index < exe_env->count; array_index++)
       ASSERT_WITH_ERRNO (Buffer_Append (&bootargs_buffer, exe_env->args[array_index], strlen (exe_env->args[array_index]) + 1)); // append string including NUL terminator
    ((bootargs_entry_t *) bootargs_buffer.bytes)->size_hi = (uint8_t) ((bootargs_buffer.size >> 8) & 0xff);
    ((bootargs_entry_t *) bootargs_buffer.bytes)->size_lo = (uint8_t) ((bootargs_buffer.size >> 0) & 0xff);
    *bootargs_offset = (size_t) exeargs_location - (size_t) out_buffer->bytes; // compute the boot args offset
+{
    static thread_local char *candidate_pathname = NULL;
    static thread_local parms_t default_parms = { 0 };
    static thread_local stringarray_t aps_partnames = { NULL, 0 };
    static int inode_count = 0; // will be preincremented each time this function is called
+   static const char *preserved_kernel_sections[] = { "QNX_info" };
    typedef struct scriptcmd_s
+   {
       char *argv0;
       int cpu_number;
    scriptcmd_t default_scriptcmd_params = { NULL, -1, false, -1, -1, -1, false, false, false };
    scriptcmd_t current_scriptcmd_params = { 0 };
    stringarray_t global_argv = { NULL, 0 };
    stringarray_t line_argv = { NULL, 0 };
    stringarray_t line_envp = { NULL, 0 };
-//   stringarray_t linker_argv = { NULL, 0 };
    const char *stored_pathname_without_leading_slash;
    const char *original_stored_pathname = NULL;
    const char *filename_bit;
    buffer_t current_line;
    buffer_t compiled_script;
+            {
                if (startup_argv.args == NULL)
+               {
                   startup_argv.args = line_argv.args; // relocate these pointers to the right place
                   startup_argv.count = line_argv.count;
+                  STRINGARRAY_FREE (&startup_envp);
+                  for (array_index = 0; array_index < global_envp.count; array_index++)
-                  startup_envp.args = line_envp.args; // relocate these pointers to the right place
+                     STRINGARRAY_PUSH (&startup_envp, global_envp.args[array_index]); // concatenate the global environment to the executable environment
-                  startup_envp.count = line_envp.count;
+                  for (array_index = 0; array_index < line_envp.count; array_index++)
+                     STRINGARRAY_PUSH (&startup_envp, line_envp.args[array_index]); // concatenate the local environment to the executable environment
+               }
                else
+               {
                   STRINGARRAY_FREE (&procnto_argv); // if procnto's argv was already assigned, free the previous array as we'll be replacing it with a new one
                   procnto_argv.args = line_argv.args; // relocate these pointers to the right place
                   procnto_argv.count = line_argv.count;
                   STRINGARRAY_FREE (&procnto_envp); // if procnto's envp was already assigned, free the previous array as we'll be replacing it with a new one
+                  for (array_index = 0; array_index < global_envp.count; array_index++)
-                  procnto_envp.args = line_envp.args; // relocate these pointers to the right place
+                     STRINGARRAY_PUSH (&procnto_envp, global_envp.args[array_index]); // concatenate the global environment to the executable environment
-                  procnto_envp.count = line_envp.count;
+                  for (array_index = 0; array_index < line_envp.count; array_index++)
+                     STRINGARRAY_PUSH (&procnto_envp, line_envp.args[array_index]); // concatenate the local environment to the executable environment
+               }
                line_argv.args = NULL; // void the line_argv array so as to not free it as we stole its args pointers
                line_argv.count = 0;
-               line_envp.args = NULL; // void the line_envp array so as to not free it as we stole its args pointers
-               line_envp.count = 0;
+            }
             else // this line contained no executable invokation, so stack up its envp assignations into the global envp array
                for (array_index = 0; array_index < line_envp.count; array_index++)
                   STRINGARRAY_PUSH (&global_envp, line_envp.args[array_index]);
                   &procnto_argv, &procnto_envp, // executable arguments (including its name) and environment to stamp in it
                   entry_parms->should_keep_ld_output, // whether to keep the linker-produced output file
                   &entry_parms->data, // buffer where to save the output
                   &procnto_bootargs_offset); // where to save the offset of the boot arguments
-         // strip this prelinked ELF file from all the sections we don't need
+         // strip this prelinked ELF file from all the sections we don't need: only keep the QNX_info one
-         ASSERT_WITH_ERRNO (Buffer_StripELFFile (&entry_parms->data, NULL, 0, true, procnto_argv.args[0])); // strip procnto as per QNX docs (align the segment size in file with the size it occupies in memory)
+         ASSERT_WITH_ERRNO (Buffer_StripELFFile (&entry_parms->data, preserved_kernel_sections, sizeof (preserved_kernel_sections) / sizeof (preserved_kernel_sections[0]), true, procnto_argv.args[0])); // strip procnto as per QNX docs (align the segment size in file with the size it occupies in memory)
          sprintf_s (candidate_pathname, MAXPATHLEN, "%s/%s", (entry_parms->prefix != NULL ? entry_parms->prefix : ""), procnto_argv.args[0]); // fix the entry name
          stored_pathname = candidate_pathname;
          entry_parms->extra_ino_flags |= IFS_INO_PROCESSED_ELF | IFS_INO_BOOTSTRAP_EXE; // mark this inode as a preprocessed *bootstrap* ELF file

Subversion Repositories QNX 8.QNX8 IFS tool

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