From d30011bf6127903367e70f9bdcb95a2d3dd2dc9f Mon Sep 17 00:00:00 2001 From: Horst Kronstorfer Date: Mon, 5 Dec 2011 00:55:23 +0000 Subject: mkenvimage: Fix some typos Signed-off-by: Horst Kronstorfer --- tools/mkenvimage.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 9c32f4a572..b7b0e0fade 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -116,7 +116,7 @@ int main(int argc, char **argv) /* Check datasize and allocate the data */ if (datasize == 0) { fprintf(stderr, - "Please specify the size of the envrionnment " + "Please specify the size of the environment " "partition.\n"); usage(argv[0]); return EXIT_FAILURE; @@ -182,12 +182,12 @@ int main(int argc, char **argv) ret = close(txt_fd); } /* - * The right test to do is "=>" (not ">") because of the additionnal + * 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 " - "envrionnment partition size\n"); + "environment partition size\n"); return EXIT_FAILURE; } @@ -196,7 +196,7 @@ int main(int argc, char **argv) if (filebuf[fp] == '\n') { if (fp == 0) { /* - * Newline at the beggining of the file ? + * Newline at the beginning of the file ? * Ignore it. */ continue; -- cgit v1.2.3 From 5e0c63e2e3e7a0aefb01d877dd7bb731ba6f00f1 Mon Sep 17 00:00:00 2001 From: Horst Kronstorfer Date: Mon, 5 Dec 2011 00:55:24 +0000 Subject: mkenvimage: Fix getopt() error handling Since the original implementation indicates explicit error handling we turn off getopt()'s internal error messaging to avoid duplicate error messages. Additionally we add ':' (missing option argument) error handling. Signed-off-by: Horst Kronstorfer --- tools/mkenvimage.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index b7b0e0fade..22d1b88ba2 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -80,8 +80,11 @@ int main(int argc, char **argv) int fp, ep; + /* Turn off getopt()'s internal error message */ + opterr = 0; + /* Parse the cmdline */ - while ((option = getopt(argc, argv, "s:o:rbp:h")) != -1) { + while ((option = getopt(argc, argv, ":s:o:rbp:h")) != -1) { switch (option) { case 's': datasize = strtol(optarg, NULL, 0); @@ -106,8 +109,13 @@ int main(int argc, char **argv) case 'h': usage(argv[0]); return EXIT_SUCCESS; + case ':': + fprintf(stderr, "Missing argument for option -%c\n", + optopt); + usage(argv[0]); + return EXIT_FAILURE; default: - fprintf(stderr, "Wrong option -%c\n", option); + fprintf(stderr, "Wrong option -%c\n", optopt); usage(argv[0]); return EXIT_FAILURE; } -- cgit v1.2.3 From 1895420b2ef7358014b355aa4f4f2c348267a6d9 Mon Sep 17 00:00:00 2001 From: Horst Kronstorfer Date: Mon, 5 Dec 2011 00:55:26 +0000 Subject: mkenvimage: Add version info switch (-V) Signed-off-by: Horst Kronstorfer --- tools/mkenvimage.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 22d1b88ba2..753d9e6ddf 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -36,6 +36,7 @@ #include #include +#include #define CRC_SIZE sizeof(uint32_t) @@ -56,6 +57,7 @@ static void usage(const char *exec_name) "\t-b : the target is big endian (default is little endian)\n" "\t-p : fill the image with 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", exec_name); @@ -84,7 +86,7 @@ int main(int argc, char **argv) opterr = 0; /* Parse the cmdline */ - while ((option = getopt(argc, argv, ":s:o:rbp:h")) != -1) { + while ((option = getopt(argc, argv, ":s:o:rbp:hV")) != -1) { switch (option) { case 's': datasize = strtol(optarg, NULL, 0); @@ -109,6 +111,9 @@ int main(int argc, char **argv) case 'h': usage(argv[0]); return EXIT_SUCCESS; + case 'V': + printf("%s version %s\n", prg, PLAIN_VERSION); + return EXIT_SUCCESS; case ':': fprintf(stderr, "Missing argument for option -%c\n", optopt); -- cgit v1.2.3