Changeset 19345 in vbox

Timestamp:

May 4, 2009 11:25:10 PM (16 years ago)

Author:

vboxsync

Message:

bin2c: -width n and -break n args for forming the output.

File:

• trunk/src/bldprogs/bin2c.c (modified) (8 diffs)

trunk/src/bldprogs/bin2c.c

@@ -59 +59 @@
             "  -max <n>     check if <binaryfile> is not bigger than <n>KB\n"
             "  -mask <n>    check if size of binaryfile is <n>-aligned\n"
+            "  -width <n>   number of bytes per line (default: 16)\n"
+            "  -break <n>   break every <n> lines    (default: -1)\n"
             "  -ascii       show ASCII representation of binary as comment\n",
             argv0);
@@ -75 +77 @@
     int           fAscii = 0;
     int           fExport = 0;
-    unsigned char abLine[16];
+    long          iBreakEvery = -1;
+    unsigned char abLine[32];
+    size_t        cbLine = 16;
     size_t        off;
     size_t        cbRead;
@@ -84 +88 @@
         return usage(argv[0]);
 
-    for (i=1; i<argc; i++)
+    for (i = 1; i < argc; i++)
     {
         if (!strcmp(argv[i], "-min"))
@@ -111 +115 @@
         {
             fExport = 1;
+        }
+        else if (!strcmp(argv[i], "-width"))
+        {
+            if (++i >= argc)
+                return usage(argv[0]);
+            cbLine = strtoul(argv[i], NULL, 0);
+            if (cbLine == 0 || cbLine > sizeof(abLine))
+            {
+                fprintf(stderr, "%s: '%s' is too wide, max %u\n",
+                        argv[0], argv[i], (unsigned)sizeof(abLine));
+                return 1;
+            }
+        }
+        else if (!strcmp(argv[i], "-break"))
+        {
+            if (++i >= argc)
+                return usage(argv[0]);
+            iBreakEvery = strtol(argv[i], NULL, 0);
+            if (iBreakEvery <= 0 && iBreakEvery != -1)
+            {
+                fprintf(stderr, "%s: -break value '%s' is not >= 1 or -1.\n",
+                        argv[0], argv[i], (unsigned)sizeof(abLine));
+                return 1;
+            }
         }
         else if (i == argc - 3)
@@ -116 +144 @@
         else
         {
-            fprintf(stderr, "%s: syntax error: Unknown argument '%s'\n", 
+            fprintf(stderr, "%s: syntax error: Unknown argument '%s'\n",
                     argv[0], argv[i]);
             return usage(argv[0]);
@@ -162 +190 @@
         /* the binary data */
         off = 0;
-        while ((cbRead = fread(&abLine[0], 1, sizeof(abLine), pFileIn)) > 0)
+        while ((cbRead = fread(&abLine[0], 1, cbLine, pFileIn)) > 0)
         {
             size_t i;
+
+            if (    iBreakEvery > 0
+                &&  off
+                && (off / cbLine) % iBreakEvery == 0)
+                fprintf(pFileOut, "\n");
+
             fprintf(pFileOut, "   ");
             for (i = 0; i < cbRead; i++)
                 fprintf(pFileOut, " 0x%02x,", abLine[i]);
-            for (; i < sizeof(abLine); i++)
+            for (; i < cbLine; i++)
                 fprintf(pFileOut, "      ");
             if (fAscii)
@@ -175 +209 @@
                 for (i = 0; i < cbRead; i++)
                     /* be careful with '/' prefixed/followed by a '*'! */
-                    fprintf(pFileOut, "%c", 
+                    fprintf(pFileOut, "%c",
                             isprint(abLine[i]) && abLine[i] != '/' ? abLine[i] : '.');
-                for (; i < sizeof(abLine); i++)
+                for (; i < cbLine; i++)
                     fprintf(pFileOut, " ");
                 fprintf(pFileOut, " */");
             }
             fprintf(pFileOut, "\n");
-    
+
             off += cbRead;
         }
-    
+
         /* check for errors */
         if (ferror(pFileIn) && !feof(pFileIn))
@@ -200 +234 @@
                     "/* end of file */\n",
                     fExport ? "DECLEXPORT(" : "", fExport ? ")" : "", argv[i], argv[i]);
-    
+
             /* flush output and check for error. */
             fflush(pFileOut);