Ticket #1755: rtems-bin2c.patch

tools/build/rtems-bin2c.c

@@ -52 +52 @@
   return c;
 }
 
+/* Turn a path name into something acceptable for a pre-processor define.
+ * This isn't perfect, it just catches '/', '.', and '-'.
+ */
+char *preprocessor_guard(const char *path_name, char *out, size_t outlen)
+{
+  int c, i, o;
+  if (outlen <= 3) {
+    return 0;
+  }
+  out[0] = '_';
+  out[1] = '_';
+  for (i = 0, o = 2; o < (outlen - 1) && (c = path_name[i]); i++, o++) {
+    switch(c) {
+      case '/':
+      case '.':
+      case '-':
+      out[o] = '_';
+      break;
+
+      default:
+      out[o] = c;
+      break;
+    }
+  }
+  out[o] = 0;
+  return out;
+}
+
 void process(const char *ifname, const char *ofname)
 {
   FILE *ifile, *ocfile, *ohfile;
   char buf[PATH_MAX], *p;
+  char guard[PATH_MAX];
   char obasename[PATH_MAX];
   char ocname[PATH_MAX];
   char ohname[PATH_MAX];
@@ -176 +205 @@
   /*****************************************************************/
 
   if ( createH ) {
-  /* print H file header */
-  fprintf(
-    ohfile,
-    "/*\n"
-    " *  Extern declarations for C structure representing binary file %s\n"
-    " *\n"
-    " *  WARNING: Automatically generated -- do not edit!\n"
-    " */\n"
-    "\n"
-    "#ifndef __%s_h\n"
-    "#define __%s_h\n"
-    "\n"
-    "#include <sys/types.h>\n"
-    "\n",
-    ifbasename,  /* header */
-    obasename,  /* ifndef */
-    obasename   /* define */
-  );
+    preprocessor_guard(ohname, guard, sizeof(guard));
+    /* print H file header */
+    fprintf(
+      ohfile,
+      "/*\n"
+      " *  Extern declarations for C structure representing binary file %s\n"
+      " *\n"
+      " *  WARNING: Automatically generated by rtems-bin2c -- do not edit!\n"
+      " */\n"
+      "\n"
+      "#ifndef %s\n"
+      "#define %s\n"
+      "\n"
+      "#include <sys/types.h>\n"
+      "\n",
+      ifbasename,  /* header */
+      guard,  /* ifndef */
+      guard   /* define */
+    );
 
-  /* print structure */
-  fprintf(
-    ohfile,
-    "extern %s%sunsigned char %s[];",
-    ((usestatic) ? "static " : ""),
-    ((useconst) ? "const " : ""),
-    buf
-  );
-  /* print sizeof */
-  fprintf(
-    ohfile,
-    "\n"
-    "extern %s%ssize_t %s_size;\n",
-    ((usestatic) ? "static " : ""),
-    ((useconst) ? "const " : ""),
-    buf
-  );
+    /* print structure */
+    fprintf(
+      ohfile,
+      "extern %s%sunsigned char %s[];",
+      ((usestatic) ? "static " : ""),
+      ((useconst) ? "const " : ""),
+      buf
+    );
+    /* print sizeof */
+    fprintf(
+      ohfile,
+      "\n"
+      "extern %s%ssize_t %s_size;\n",
+      ((usestatic) ? "static " : ""),
+      ((useconst) ? "const " : ""),
+      buf
+    );
 
-  fprintf(
-    ohfile,
-    "\n"
-    "#endif\n"
-  );
+    fprintf(
+      ohfile,
+      "\n"
+      "#endif\n"
+    );
   } /* createH */
   
   /*****************************************************************/