Changeset 31cd205d in rtems

Timestamp:

Apr 12, 2018, 4:12:06 AM (2 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, master

Children:

86e79d7

Parents:

2a61542

git-author:

Chris Johns <chrisj@…> (04/12/18 04:12:06)

git-committer:

Chris Johns <chrisj@…> (04/12/18 07:54:59)

Message:

tools: Add a -N option to force a name on the array.

This can be used to have a different file name for the same data
name.

Update #2769

File:

• tools/build/rtems-bin2c.c (modified) (7 diffs)

tools/build/rtems-bin2c.c

@@ -53 +53 @@
 }
 
-void process(const char *ifname, const char *ofname)
+void process(const char *ifname, const char *ofname, const char *forced_name)
 {
   FILE *ifile, *ocfile, *ohfile;
@@ -120 +120 @@
 
   /* find basename */
-  char *ifbasename_to_free = strdup(ifname);
+  char *ifbasename_to_free =
+    forced_name != NULL ? strdup(forced_name) : strdup(ifname);
   if ( ifbasename_to_free == NULL ) {
     fprintf(stderr, "cannot allocate memory\n" );
@@ -261 +262 @@
   fprintf(
      stderr,
-     "usage: bin2c [-csvzCH] <input_file> <output_file>\n"
+     "usage: bin2c [-csvzCH] [-N name] <input_file> <output_file>\n"
      "  <input_file> is the binary file to convert\n"
      "  <output_file> should not have a .c or .h extension\n"
@@ -271 +272 @@
      "  -H - create c-header only\n"
      "  -C - create c-source file only\n"
+     "  -N - force name of data array\n"
     );
   exit(1);
@@ -277 +279 @@
 int main(int argc, char **argv)
 {
+  const char *name = NULL;
   while (argc > 3) {
     if (!strcmp(argv[1], "-c")) {
@@ -304 +307 @@
       --argc;
       ++argv;
+    } else if (!strcmp(argv[1], "-N")) {
+      --argc;
+      ++argv;
+      if (argc <= 1) {
+        fprintf(stderr, "error: -N needs a name\n");
+        usage();
+      }
+      name = argv[1];
+      --argc;
+      ++argv;
     } else {
       usage();
@@ -313 +326 @@
 
   /* process( input_file, output_basename ) */
-  process(argv[1], argv[2]);
+  process(argv[1], argv[2], name);
   return 0;
 }
-