Merge branch 'next' of ../next

[karo-tx-uboot.git] / tools / mkenvimage.c

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 753d9e6ddf344835f02c2a835dad1464ee3a47df..c5ed373b99217cd09b7c84578abae27e4ee09661 100644 (file)
--- 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,19 +115,19 @@ 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);
                        return EXIT_SUCCESS;
                case ':':
                        fprintf(stderr, "Missing argument for option -%c\n",
-                               optopt);
+                               option);
                        usage(argv[0]);
                        return EXIT_FAILURE;
                default:
-                       fprintf(stderr, "Wrong option -%c\n", optopt);
-                       usage(argv[0]);
+                       fprintf(stderr, "Wrong option -%c\n", option);
+                       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;
        }