Also, don't split error messages over several lines as per a coding style exception making them easier to grep.

Signed-off-by: David Wagner david.wagner@free-electrons.com ---

This version is rebased on top of 'next' (it didn't apply anymore, after Horst Kronstorfer's patches).

tools/mkenvimage.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 753d9e6..5f7d6ea 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -42,12 +42,9 @@

static void usage(const char *exec_name) { - fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] " - "-s <environment partition size> -o <output> <input file>\n" + fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] -s <environment partition size> -o <output> <input file>\n" "\n" - "This tool takes a key=value input file (same as would a " - "`printenv' show) and generates the corresponding environment " - "image, ready to be flashed.\n" + "This tool takes a key=value input file (same as would a `printenv' show) and generates the corresponding environment image, ready to be flashed.\n" "\n" "\tThe input file is in format:\n" "\t\tkey1=value1\n" @@ -55,8 +52,7 @@ static void usage(const char *exec_name) "\t\t...\n" "\t-r : the environment has multiple copies in flash\n" "\t-b : the target is big endian (default is little endian)\n" - "\t-p <byte> : fill the image with <byte> bytes instead of " - "0xff bytes\n" + "\t-p <byte> : fill the image with <byte> bytes instead of 0xff bytes\n" "\t-V : print version information and exit\n" "\n" "If the input file is "-", data is read from standard input\n", @@ -94,8 +90,7 @@ int main(int argc, char **argv) case 'o': bin_filename = strdup(optarg); if (!bin_filename) { - fprintf(stderr, "Can't strdup() the output " - "filename\n"); + fprintf(stderr, "Can't strdup() the output filename\n"); return EXIT_FAILURE; } break; @@ -128,22 +123,21 @@ int main(int argc, char **argv)

/* Check datasize and allocate the data */ if (datasize == 0) { - fprintf(stderr, - "Please specify the size of the environment " - "partition.\n"); + fprintf(stderr, "Please specify the size of the environment partition.\n"); usage(argv[0]); return EXIT_FAILURE; }

dataptr = malloc(datasize * sizeof(*dataptr)); if (!dataptr) { - fprintf(stderr, "Can't alloc dataptr.\n"); + fprintf(stderr, "Can't alloc %d bytes for dataptr.\n", + datasize); return EXIT_FAILURE; }

/* * envptr points to the beginning of the actual environment (after the - * crc and possible `redundant' bit + * crc and possible `redundant' byte */ envsize = datasize - (CRC_SIZE + redundant); envptr = dataptr + CRC_SIZE + redundant; @@ -179,8 +173,8 @@ int main(int argc, char **argv) /* ... and check it */ ret = fstat(txt_fd, &txt_file_stat); if (ret == -1) { - fprintf(stderr, "Can't stat() on "%s": " - "%s\n", txt_filename, strerror(errno)); + fprintf(stderr, "Can't stat() on "%s": %s\n", + txt_filename, strerror(errno)); return EXIT_FAILURE; }

@@ -194,6 +188,7 @@ int main(int argc, char **argv) } ret = close(txt_fd); } +<<<<<<< HEAD /* * The right test to do is "=>" (not ">") because of the additional * ending \0. See below. @@ -201,6 +196,11 @@ int main(int argc, char **argv) if (filesize >= envsize) { fprintf(stderr, "The input file is larger than the " "environment partition size\n"); +======= + /* The +1 is for the additionnal ending \0. See below. */ + if (filesize + 1 > envsize) { + fprintf(stderr, "The input file is larger than the environment partition size\n"); +>>>>>>> mkenvimage: correct and clarify comments and error messages return EXIT_FAILURE; }

@@ -249,8 +249,7 @@ int main(int argc, char **argv) * check the env size again to make sure we have room for two \0 */ if (ep >= envsize) { - fprintf(stderr, "The environment file is too large for " - "the target environment storage\n"); + fprintf(stderr, "The environment file is too large for the target environment storage\n"); return EXIT_FAILURE; } envptr[ep] = '\0';

compiler.h and u-boot/crc.h need to be included from U-Boot's headers.

stdlib.h was missing.

Signed-off-by: David Wagner david.wagner@free-electrons.com ---

This version is rebased on top of 'next' (it didn't apply anymore, after Horst Kronstorfer's patches).

tools/mkenvimage.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 5f7d6ea..b8b5c3a 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -28,14 +28,15 @@ #include <errno.h> #include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <stdint.h> #include <string.h> #include <unistd.h> -#include <compiler.h> +#include "compiler.h" #include <sys/types.h> #include <sys/stat.h>

-#include <u-boot/crc.h> +#include "u-boot/crc.h" #include <version.h>

#define CRC_SIZE sizeof(uint32_t) @@ -188,19 +189,9 @@ int main(int argc, char **argv) } ret = close(txt_fd); } -<<<<<<< HEAD - /* - * The right test to do is "=>" (not ">") because of the additional - * ending \0. See below. - */ - if (filesize >= envsize) { - fprintf(stderr, "The input file is larger than the " - "environment partition size\n"); -======= /* The +1 is for the additionnal ending \0. See below. */ if (filesize + 1 > envsize) { fprintf(stderr, "The input file is larger than the environment partition size\n"); ->>>>>>> mkenvimage: correct and clarify comments and error messages return EXIT_FAILURE; }

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile index a5f989a..64bcc4d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -194,6 +194,7 @@ $(obj)xway-swap-bytes$(SFX): $(obj)xway-swap-bytes.o

$(obj)mkenvimage$(SFX): $(obj)crc32.o $(obj)mkenvimage.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ + $(HOSTSTRIP) $@

$(obj)mkimage$(SFX): $(obj)aisimage.o \ $(obj)crc32.o \

compiler.h and u-boot/crc.h need to be included from U-Boot's headers.

stdlib.h was missing.

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 7d33143..bc18736 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -31,14 +31,15 @@ #include <errno.h> #include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <stdint.h> #include <string.h> #include <unistd.h> -#include <compiler.h> +#include "compiler.h" #include <sys/types.h> #include <sys/stat.h>

-#include <u-boot/crc.h> +#include "u-boot/crc.h" #include <version.h>

#define CRC_SIZE sizeof(uint32_t)

compiler.h needs to be included from U-Boot's headers. Also, group U-Boot-specific includes together

stdlib.h was missing.

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index c95f7f5..810a89e 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -31,13 +31,14 @@ #include <errno.h> #include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <stdint.h> #include <string.h> #include <unistd.h> -#include <compiler.h> #include <sys/types.h> #include <sys/stat.h>

+#include "compiler.h" #include <u-boot/crc.h> #include <version.h>

Verbosly fail if the target environment size or the padding byte are badly formated.

Verbosly fail if something bad happens when reading from standard input.

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index bc18736..eb9a8f2 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -93,7 +93,17 @@ int main(int argc, char **argv) switch (option) { case 's': datasize = strtol(optarg, NULL, 0); - break; + if (!errno) + break; + + if (errno == ERANGE) + fprintf(stderr, "Bad integer format: %s\n", + optarg); + else + fprintf(stderr, "Error while parsing %s: %s\n", + optarg, strerror(errno)); + + return EXIT_FAILURE; case 'o': bin_filename = strdup(optarg); if (!bin_filename) { @@ -109,7 +119,17 @@ int main(int argc, char **argv) break; case 'p': padbyte = strtol(optarg, NULL, 0); - break; + if (!errno) + break; + + if (errno == ERANGE) + fprintf(stderr, "Bad integer format: %s\n", + optarg); + else + fprintf(stderr, "Error while parsing %s: %s\n", + optarg, strerror(errno)); + + return EXIT_FAILURE; case 'h': usage(prg); return EXIT_SUCCESS; @@ -166,7 +186,15 @@ int main(int argc, char **argv)

do { filebuf = realloc(filebuf, readlen); + if (!filebuf) { + fprintf(stderr, "Can't realloc memory for the input file buffer\n"); + return EXIT_FAILURE; + } readbytes = read(txt_fd, filebuf + filesize, readlen); + if (errno) { + fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno)); + return EXIT_FAILURE; + } filesize += readbytes; } while (readbytes == readlen);

Verbosly fail if the target environment size or the padding byte are badly formated.

Verbosly fail if something bad happens when reading from standard input.

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 810a89e..9f2490e 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -63,6 +63,23 @@ static void usage(const char *exec_name) exec_name); }

+long int xstrtol(char *s) +{ + long int tmp; + + tmp = strtol(s, NULL, 0); + if (!errno) + return tmp; + + if (errno == ERANGE) + fprintf(stderr, "Bad integer format: %s\n", s); + else + fprintf(stderr, "Error while parsing %s: %s\n", s, + strerror(errno)); + + exit(EXIT_FAILURE); +} + int main(int argc, char **argv) { uint32_t crc, targetendian_crc; @@ -92,7 +109,7 @@ int main(int argc, char **argv) while ((option = getopt(argc, argv, ":s:o:rbp:hV")) != -1) { switch (option) { case 's': - datasize = strtol(optarg, NULL, 0); + datasize = xstrtol(optarg); break; case 'o': bin_filename = strdup(optarg); @@ -108,7 +125,7 @@ int main(int argc, char **argv) bigendian = 1; break; case 'p': - padbyte = strtol(optarg, NULL, 0); + padbyte = xstrtol(optarg); break; case 'h': usage(prg); @@ -166,7 +183,16 @@ int main(int argc, char **argv)

do { filebuf = realloc(filebuf, readlen); + if (!filebuf) { + fprintf(stderr, "Can't realloc memory for the input file buffer\n"); + return EXIT_FAILURE; + } readbytes = read(txt_fd, filebuf + filesize, readlen); + if (errno) { + fprintf(stderr, "Error while reading stdin: %s\n", + strerror(errno)); + return EXIT_FAILURE; + } filesize += readbytes; } while (readbytes == readlen);

Verbosly fail if the target environment size or the padding byte are badly formated.

Verbosly fail if something bad happens when reading from standard input.

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 810a89e..cc1deec 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -63,6 +63,24 @@ static void usage(const char *exec_name) exec_name); }

+long int xstrtol(const char *s) +{ + long int tmp; + + errno = 0; + tmp = strtol(s, NULL, 0); + if (!errno) + return tmp; + + if (errno == ERANGE) + fprintf(stderr, "Bad integer format: %s\n", s); + else + fprintf(stderr, "Error while parsing %s: %s\n", s, + strerror(errno)); + + exit(EXIT_FAILURE); +} + int main(int argc, char **argv) { uint32_t crc, targetendian_crc; @@ -92,7 +110,7 @@ int main(int argc, char **argv) while ((option = getopt(argc, argv, ":s:o:rbp:hV")) != -1) { switch (option) { case 's': - datasize = strtol(optarg, NULL, 0); + datasize = xstrtol(optarg); break; case 'o': bin_filename = strdup(optarg); @@ -108,7 +126,7 @@ int main(int argc, char **argv) bigendian = 1; break; case 'p': - padbyte = strtol(optarg, NULL, 0); + padbyte = xstrtol(optarg); break; case 'h': usage(prg); @@ -166,7 +184,16 @@ int main(int argc, char **argv)

do { filebuf = realloc(filebuf, readlen); + if (!filebuf) { + fprintf(stderr, "Can't realloc memory for the input file buffer\n"); + return EXIT_FAILURE; + } readbytes = read(txt_fd, filebuf + filesize, readlen); + if (errno) { + fprintf(stderr, "Error while reading stdin: %s\n", + strerror(errno)); + return EXIT_FAILURE; + } filesize += readbytes; } while (readbytes == readlen);

Remove this feature since it seems impossible to reliably detect them.

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 58f1d0b..a3d4e27 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -249,14 +249,6 @@ int main(int argc, char **argv) /* End of a variable */ envptr[ep++] = '\0'; } - } else if (filebuf[fp] == '#') { - if (fp != 0 && filebuf[fp-1] == '\n') { - /* This line is a comment, let's skip it */ - while (fp < txt_file_stat.st_size && fp++ && - filebuf[fp] != '\n'); - } else { - envptr[ep++] = filebuf[fp]; - } } else { envptr[ep++] = filebuf[fp]; }

Signed-off-by: David Wagner david.wagner@free-electrons.com --- tools/mkenvimage.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 221e9de..4e69056 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -257,7 +257,9 @@ int main(int argc, char **argv) crc = crc32(0, envptr, envsize); targetendian_crc = bigendian ? cpu_to_be32(crc) : cpu_to_le32(crc);

- memcpy(dataptr, &targetendian_crc, sizeof(uint32_t)); + memcpy(dataptr, &targetendian_crc, sizeof(targetendian_crc)); + if (redundant) + dataptr[sizeof(targetendian_crc)] = 1;

if (!bin_filename || strcmp(bin_filename, "-") == 0) { bin_fd = STDOUT_FILENO;