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

 // TODO: startup file stripping
-// TODO: kernel file stripping
 // TODO: boot script compiler
 // standard C includes
 #include <stdint.h>
 #include <stdbool.h>
    bool should_allow_nonexistent_files; // [+|-optional] whether to continue processing on unexistent files
    bool is_bootstrap_file; // entry has the [virtual] attribute
    bool is_compiled_bootscript; // entry has [+script] attribute
    int extra_ino_flags; // bitmap of extra inode flags (IFS_INO_xxx)
    char *search; // [search=path[:path]] binary search path (the default one will be constructed at startup)
    buffer_t data; // the resolved file's own data bytes
 } parms_t;
 // bootable IFS support
 static char *bootfile_pathname = NULL;           // HACK: pathname to bootcode binary blob file to put at the start of a bootable IFS
 static size_t bootfile_size = 0;                 // HACK: size of the bootcode binary blob file to put at the start of a bootable IFS
 static char *startupfile_pathname = NULL;        // HACK: pathname to precompiled startup file blob to put in the startup header of a bootable IFS
 static size_t startupfile_ep_from_imagebase = 0; // HACK: startup code entrypoint offset from image base for a bootable IFS
-static size_t kernelfile_offset = 0x32000;       // kernel file offset in the IFS (is it ever supposed to change)
+static size_t kernelfile_offset = 0x32000;       // kernel file offset in the IFS (is it ever supposed to change?)
 // exported function prototypes
 int32_t update_checksum (const void *data, const size_t data_len, const bool is_foreign_endianness); // compute an IFS image or startup checksum to store in the trailer
       char **args;
       size_t count;
    } stringarray_t;
    static thread_local char *candidate_pathname = NULL;
+   static thread_local parms_t default_parms = { 0 };
    static int inode_count = 0; // will be preincremented each time this function is called
    stringarray_t global_argv = { NULL, 0 };
    stringarray_t global_envp = { NULL, 0 };
    stringarray_t line_argv = { NULL, 0 };
       ASSERT_WITH_ERRNO (candidate_pathname);
+   }
    if (S_ISDIR (entry_parms->st_mode)) // are we storing a directory ?
+   {
+      if (buildhost_pathname != NULL) // was a source file pathname supplied ?
+      {
+         memcpy (&default_parms, entry_parms, sizeof (parms_t)); // apply current entry parameters when including a directory recursively
+         add_directory_contents_recursively (fsentries, fsentry_count, buildhost_pathname, strlen (buildhost_pathname), &default_parms); // if so, add this diretory contents recursively
+      }
       LOG_INFO ("directory: ino 0x%x uid %d gid %d mode 0%o path \"%s\"", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname);
+   }
-   else if (S_ISREG (entry_parms->st_mode)) // else are we storing a regular file ?
+   else if (S_ISLNK (entry_parms->st_mode)) // else are we storing a symbolic link ?
+   {
+      // do we already know the data for this data blob ?
+      if (entry_parms->data.bytes != NULL)
+      {
+         entry_parms->mtime = entry_parms->mtime_for_inline_files; // if so, set it a mtime equal to the mtime to use for inline files
+         LOG_INFO ("symlink: ino 0x%x uid %d gid %d mode 0%o path \"%s\" -> \"%s\"", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname, entry_parms->data.bytes);
+      }
+      else if (buildhost_pathname != NULL) // else was a source file pathname supplied ?
+      {
+         entry_parms->data.bytes = malloc (MAXPATHLEN); // allocate enough space for symlink data
+         ASSERT_WITH_ERRNO (entry_parms->data.bytes);
+         retval = readlink (buildhost_pathname, entry_parms->data.bytes, MAXPATHLEN); // read symlink contents
+         ASSERT_WITH_ERRNO (retval > 0);
+         entry_parms->data.size = retval; // save symlink target length
+      }
+      else
+         DIE_WITH_EXITCODE (1, "unexpected code path: can't store a symlink without neither explicit contents nor a host pathname. This is a bug in the program. Please contact the author.");
+   }
+   else if (S_ISFIFO (entry_parms->st_mode)) // else are we storing a FIFO ?
+   {
+      if ((entry_parms->data.bytes == NULL) || (strchr (entry_parms->data.bytes, ':') == NULL))
+         DIE_WITH_EXITCODE (1, "device entry \"%s\" malformed (no 'dev:rdev' pair)", stored_pathname);
+      LOG_INFO ("fifo: ino 0x%x uid %d gid %d mode 0%o path \"%s\" dev:rdev %s)", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname, entry_parms->data.bytes);
+   }
+   else // necessarily a regular file (either S_IFREG is specified, or st_mode is zero)
+   {
+      entry_parms->st_mode |= S_IFREG; // make this explicit
       if (entry_parms->is_bootstrap_file) // is it the bootstrap file ?
+      {
          // parse each line of contents
          ASSERT (entry_parms->data.size > 0, "kernel specification without inline contents");
             Buffer_StripELFFile (&entry_parms->data, (const char **) saved_ELF_sections, saved_ELF_section_count, false, stored_pathname); // strip the ELF file à la mkifs
             entry_parms->extra_ino_flags |= IFS_INO_PROCESSED_ELF; // mark this inode as a preprocessed ELF file
          } // end if the file is not yet a processed ELF
       } // end if the file we're storing is an ELF file
       #undef ELFHDR // undefine the macro that used to always point to the ELF header at the beginning of the file
-   }
-   else if (S_ISLNK (entry_parms->st_mode)) // else are we storing a symbolic link ?
-   {
-      // do we already know the data for this data blob ?
-      if (entry_parms->data.bytes != NULL)
-      {
-         entry_parms->mtime = entry_parms->mtime_for_inline_files; // if so, set it a mtime equal to the mtime to use for inline files
-         LOG_INFO ("symlink: ino 0x%x uid %d gid %d mode 0%o path \"%s\" -> \"%s\"", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname, entry_parms->data.bytes);
-      }
-      else if (buildhost_pathname != NULL) // else was a source file pathname supplied ?
-      {
-         entry_parms->data.bytes = malloc (MAXPATHLEN); // allocate enough space for symlink data
-         ASSERT_WITH_ERRNO (entry_parms->data.bytes);
-         retval = readlink (buildhost_pathname, entry_parms->data.bytes, MAXPATHLEN); // read symlink contents
-         ASSERT_WITH_ERRNO (retval > 0);
-         entry_parms->data.size = retval; // save symlink target length
-      }
-      else
-         DIE_WITH_EXITCODE (1, "unexpected code path: can't store a symlink without neither explicit contents nor a host pathname. This is a bug in the program. Please contact the author.");
-   }
-   else // we must be storing a FIFO
-   {
-      if ((entry_parms->data.bytes == NULL) || (strchr (entry_parms->data.bytes, ':') == NULL))
-         DIE_WITH_EXITCODE (1, "device entry \"%s\" malformed (no 'dev:rdev' pair)", stored_pathname);
-      LOG_INFO ("fifo: ino 0x%x uid %d gid %d mode 0%o path \"%s\" dev:rdev %s)", inode_count + 1, entry_parms->uid, entry_parms->gid, entry_parms->st_mode, stored_pathname, entry_parms->data.bytes);
+   }
    // have a pointer to where the stored pathname actually starts, without the leading slash
    stored_pathname_without_leading_slash = stored_pathname[0] == '/' ? &stored_pathname[1] : stored_pathname;
    fsentry_t *fsentries = NULL; // output IFS's filesystem entries
    size_t fsentry_count = 0; // number of entries in the IFS filesystem
    parms_t default_parms = { // default parameters for a filesystem entry
       .dperms = 0755,
       .perms = 0644,
-      .uid = 0,
-      .gid = 0,
-      .st_mode = S_IFREG,
       .mtime = UINT32_MAX,
       .mtime_for_inline_files = UINT32_MAX,
       .prefix = "/proc/boot",
       .should_follow_symlinks = true, // [+|-followlink]
       .should_autosymlink_dylib = true, // [+|-autolink]
-      .is_compiled_bootscript = false, // [+|-script]
-      .extra_ino_flags = 0,
-      .search = NULL,
-      .data = { NULL, 0 }
    };
    parms_t entry_parms = { 0 }; // current parameters for a filesystem entry (will be initialized to default_parms each time a new entry is parsed in the build file)
    char path_on_buildhost[MAXPATHLEN] = "";
    char path_in_ifs[MAXPATHLEN] = "";
       fprintf (out, "    ifstool --info [--everything] <ifs file>\n");
       fprintf (out, "    ifstool --dump [--outdir <path>] <ifs file>\n");
       fprintf (out, "    ifstool --strip [--outfile <pathname>] <ELF file>\n");
       fprintf (out, "    ifstool [-?|--help]\n");
       // mkifs [-?] [-l inputline] [-n[n]] [-o directory] [-p patchfile] [-r rootdir] [-s section] [-v] [buildfile] [directory] [outputfile]
-      fprintf (out, "    ifstool [--bootfile <pathname>] [--startupfile <pathname>@<EP_from_imgbase>] [--kernelfile <pathname>@<fileoffs>] [-a suffix] [-l inputline] [-n[n]] [-r rootdir] [-s section] [-v[...]] <buildfile> [directory] [outfile]\n");
+      fprintf (out, "    ifstool [--bootfile <pathname>] [--startupfile <pathname>@<EP_from_imgbase>] [--kerneloffs <fileoffs>] [-a suffix] [-l inputline] [-n[n]] [-r rootdir] [-s section] [-v[...]] [buildfile] [directory] [outputfile]\n");
-      fprintf (out, "NOTE: the compiler mode requires predigested boot, startup and kernel files produced by mkifs.\n");
+      fprintf (out, "NOTE: the compiler mode requires predigested boot and startup files produced by mkifs.\n");
       fprintf (out, "options:\n");
       fprintf (out, "    -?       Display some help information.\n");
       fprintf (out, "    -a .ext  Append a suffix to symbol files generated via [+keeplinked].\n");
       fprintf (out, "    -l line  Process line before interpreting the buildfile. Input lines given\n");
       fprintf (out, "             to mkifs should be quoted to prevent interpretation by the shell\n");

Subversion Repositories QNX 8.QNX8 IFS tool

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