sandbox: config: enable fdt and snprintf() options

[u-boot] / tools / mkenvimage.c

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index c5ed373b99217cd09b7c84578abae27e4ee09661..f78173163f815d4ff5f7f34e708d254059293e77 100644 (file)
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -122,11 +122,11 @@ int main(int argc, char **argv)
                        return EXIT_SUCCESS;
                case ':':
                        fprintf(stderr, "Missing argument for option -%c\n",
-                               option);
+                               optopt);
                        usage(argv[0]);
                        return EXIT_FAILURE;
                default:
-                       fprintf(stderr, "Wrong option -%c\n", option);
+                       fprintf(stderr, "Wrong option -%c\n", optopt);
                        usage(prg);
                        return EXIT_FAILURE;
                }
@@ -213,18 +213,18 @@ int main(int argc, char **argv)
        /* Replace newlines separating variables with \0 */
        for (fp = 0, ep = 0 ; fp < filesize ; fp++) {
                if (filebuf[fp] == '\n') {
-                       if (fp == 0) {
+                       if (ep == 0) {
                                /*
-                                * Newline at the beginning of the file ?
-                                * Ignore it.
+                                * Newlines at the beginning of the file ?
+                                * Ignore them.
                                 */
                                continue;
                        } else if (filebuf[fp-1] == '\\') {
                                /*
                                 * Embedded newline in a variable.
                                 *
-                                * The backslash was added to the envptr ;
-                                * rewind and replace it with a newline
+                                * The backslash was added to the envptr; rewind
+                                * and replace it with a newline
                                 */
                                ep--;
                                envptr[ep++] = '\n';