Changeset 12192 in vbox for trunk/src/bldprogs

Timestamp:

Sep 8, 2008 1:54:10 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36166

Message:

bin2c: removed some gotos, corrected the file header and caught a case where the output file wasn't deleted on error.

File:

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

trunk/src/bldprogs/bin2c.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PC-BIOS - Binary 2 C Structure Converter.
+ * bin2c - Binary 2 C Structure Converter.
  */
 
@@ -52 +52 @@
 }
 
+static int usage(const char *argv0)
+{
+    fprintf(stderr,
+            "Syntax: %s [options] <arrayname> <binaryfile> <outname>\n"
+            "  -min <n>     check if <binaryfile> is not smaller than <n>KB\n"
+            "  -max <n>     check if <binaryfile> is not bigger than <n>KB\n"
+            "  -mask <n>    check if size of binaryfile is <n>-aligned\n"
+            "  -ascii       show ASCII representation of binary as comment\n",
+            argv0);
+
+    return 1;
+}
 
 int main(int argc, char *argv[])
@@ -67 +79 @@
     size_t        cbRead;
     size_t        cbBin;
+    int           rc = 1;               /* assume the worst... */
 
     if (argc < 2)
-        goto syntax_error;
+        return usage(argv[0]);
 
     for (i=1; i<argc; i++)
@@ -75 +88 @@
         if (!strcmp(argv[i], "-min"))
         {
-            if (++i>=argc)
-                goto syntax_error;
+            if (++i >= argc)
+                return usage(argv[0]);
             cbMin = 1024 * strtoul(argv[i], NULL, 0);
-            continue;
         }
         else if (!strcmp(argv[i], "-max"))
         {
-            if (++i>=argc)
-                goto syntax_error;
+            if (++i >= argc)
+                return usage(argv[0]);
             cbMax = 1024 * strtoul(argv[i], NULL, 0);
-            continue;
         }
         else if (!strcmp(argv[i], "-mask"))
         {
-            if (++i>=argc)
-                goto syntax_error;
+            if (++i >= argc)
+                return usage(argv[0]);
             uMask = strtoul(argv[i], NULL, 0);
-            continue;
         }
         else if (!strcmp(argv[i], "-ascii"))
         {
             fAscii = 1;
-            continue;
         }
         else if (!strcmp(argv[i], "-export"))
         {
             fExport = 1;
-            continue;
-        }
-        else if (i==argc-3)
+        }
+        else if (i == argc - 3)
             break;
-
-syntax_error:
-        fprintf(stderr,
-                "Syntax: %s [options] <arrayname> <binaryfile> <outname>\n"
-                "  -min <n>     check if <binaryfile> is not smaller than <n>KB\n"
-                "  -max <n>     check if <binaryfile> is not bigger than <n>KB\n"
-                "  -mask <n>    check if size of binaryfile is <n>-aligned\n"
-                "  -ascii       show ASCII representation of binary as comment\n",
-                argv[0]);
-        return 1;
+        else
+        {
+            fprintf(stderr, "%s: syntax error: Unknown argument '%s'\n", 
+                    argv[0], argv[i]);
+            return usage(argv[0]);
+        }
     }
 
@@ -150 +154 @@
     /* check size restrictions */
     if (uMask && (cbBin & uMask))
-    {
         fprintf(stderr, "%s: size=%ld - Not aligned!\n", argv[0], (long)cbBin);
-        return 1;
-    }
-    if (cbBin < cbMin || cbBin > cbMax)
-    {
+    else if (cbBin < cbMin || cbBin > cbMax)
         fprintf(stderr, "%s: size=%ld - Not %ld-%ldb in size!\n",
                 argv[0], (long)cbBin, (long)cbMin, (long)cbMax);
-        return 1;
-    }
-
-    /* the binary data */
-    off = 0;
-    while ((cbRead = fread(&abLine[0], 1, sizeof(abLine), pFileIn)) > 0)
-    {
-        size_t i;
-        fprintf(pFileOut, "   ");
-        for (i = 0; i < cbRead; i++)
-            fprintf(pFileOut, " 0x%02x,", abLine[i]);
-        for (; i < sizeof(abLine); i++)
-            fprintf(pFileOut, "      ");
-        if (fAscii)
-        {
-            fprintf(pFileOut, " /* 0x%08lx: ", (long)off);
+    else
+    {
+        /* the binary data */
+        off = 0;
+        while ((cbRead = fread(&abLine[0], 1, sizeof(abLine), pFileIn)) > 0)
+        {
+            size_t i;
+            fprintf(pFileOut, "   ");
             for (i = 0; i < cbRead; i++)
-                /* be careful with '/' prefixed/followed by a '*'! */
-                fprintf(pFileOut, "%c", 
-                        isprint(abLine[i]) && abLine[i] != '/' ? abLine[i] : '.');
+                fprintf(pFileOut, " 0x%02x,", abLine[i]);
             for (; i < sizeof(abLine); i++)
-                fprintf(pFileOut, " ");
-            fprintf(pFileOut, " */");
-        }
-        fprintf(pFileOut, "\n");
-
-        off += cbRead;
-    }
-
-    /* check for errors */
-    if (ferror(pFileIn) && !feof(pFileIn))
-    {
-        fprintf(stderr, "%s: read error\n", argv[0]);
-        goto error;
-    }
-    if (off != cbBin)
-    {
-        fprintf(stderr, "%s: read error off=%ld cbBin=%ld\n", argv[0], (long)off, (long)cbBin);
-        goto error;
-    }
-
-    /* finish the structure. */
-    fprintf(pFileOut,
-            "};\n"
-            "\n"
-            "%sconst unsigned%s g_cb%s = sizeof(g_ab%s);\n"
-            "/* end of file */\n",
-            fExport ? "DECLEXPORT(" : "", fExport ? ")" : "", argv[i], argv[i]);
+                fprintf(pFileOut, "      ");
+            if (fAscii)
+            {
+                fprintf(pFileOut, " /* 0x%08lx: ", (long)off);
+                for (i = 0; i < cbRead; i++)
+                    /* be careful with '/' prefixed/followed by a '*'! */
+                    fprintf(pFileOut, "%c", 
+                            isprint(abLine[i]) && abLine[i] != '/' ? abLine[i] : '.');
+                for (; i < sizeof(abLine); i++)
+                    fprintf(pFileOut, " ");
+                fprintf(pFileOut, " */");
+            }
+            fprintf(pFileOut, "\n");
+    
+            off += cbRead;
+        }
+    
+        /* check for errors */
+        if (ferror(pFileIn) && !feof(pFileIn))
+            fprintf(stderr, "%s: read error\n", argv[0]);
+        else if (off != cbBin)
+            fprintf(stderr, "%s: read error off=%ld cbBin=%ld\n", argv[0], (long)off, (long)cbBin);
+        else
+        {
+            /* no errors, finish the structure. */
+            fprintf(pFileOut,
+                    "};\n"
+                    "\n"
+                    "%sconst unsigned%s g_cb%s = sizeof(g_ab%s);\n"
+                    "/* end of file */\n",
+                    fExport ? "DECLEXPORT(" : "", fExport ? ")" : "", argv[i], argv[i]);
+    
+            /* flush output and check for error. */
+            fflush(pFileOut);
+            if (ferror(pFileOut))
+                fprintf(stderr, "%s: write error\n", argv[0]);
+            else
+                rc = 0; /* success! */
+        }
+    }
+
+    /* cleanup, delete the output file on failure. */
+    fclose(pFileOut);
     fclose(pFileIn);
-
-    /* flush output and check for error. */
-    fflush(pFileOut);
-    if (ferror(pFileOut))
-    {
-        fprintf(stderr, "%s: write error\n", argv[0]);
-        goto error;
-    }
-    fclose(pFileOut);
-
-    return 0;
-
-error:
-    fclose(pFileOut);
-    remove(argv[i+2]);
-    return 1;
+    if (rc)
+        remove(argv[i+2]);
+
+    return rc;
 }