Signed-off-by: Horst Kronstorfer hkronsto@frequentis.com --- Changes for v2: - Use the GNU version of basename(). - Rebased against branch 'next.'
tools/mkenvimage.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 753d9e6..6a6a392 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -25,6 +25,9 @@ * MA 02111-1307 USA */
+/* We want the GNU version of basename() */ +#define _GNU_SOURCE + #include <errno.h> #include <fcntl.h> #include <stdio.h> @@ -81,6 +84,9 @@ int main(int argc, char **argv) struct stat txt_file_stat;
int fp, ep; + const char *prg; + + prg = basename(argv[0]);
/* Turn off getopt()'s internal error message */ opterr = 0; @@ -109,7 +115,7 @@ int main(int argc, char **argv) padbyte = strtol(optarg, NULL, 0); break; case 'h': - usage(argv[0]); + usage(prg); return EXIT_SUCCESS; case 'V': printf("%s version %s\n", prg, PLAIN_VERSION); @@ -117,11 +123,11 @@ int main(int argc, char **argv) case ':': fprintf(stderr, "Missing argument for option -%c\n", optopt); - usage(argv[0]); + usage(prg); return EXIT_FAILURE; default: fprintf(stderr, "Wrong option -%c\n", optopt); - usage(argv[0]); + usage(prg); return EXIT_FAILURE; } } @@ -131,7 +137,7 @@ int main(int argc, char **argv) fprintf(stderr, "Please specify the size of the environment " "partition.\n"); - usage(argv[0]); + usage(prg); return EXIT_FAILURE; }