diff mbox

[U-Boot,v3] Print program basename instead of whole path in usage()

Message ID 1324499979-4978-1-git-send-email-hkronsto@frequentis.com
State Accepted
Headers show

Commit Message

Horst Kronstorfer Dec. 21, 2011, 8:39 p.m. UTC 
Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
---
Changes for v2:
   - Use the GNU version of basename().
   - Rebase against branch 'next.'
Changes for v3:
   - Rebase against branch 'master.'

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

Comments

Wolfgang Denk Dec. 22, 2011, 8:09 a.m. UTC | #1 
Dear Horst Kronstorfer,

In message <1324499979-4978-1-git-send-email-hkronsto@frequentis.com> you wrote:
> Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
> ---
> Changes for v2:
>    - Use the GNU version of basename().
>    - Rebase against branch 'next.'
> Changes for v3:
>    - Rebase against branch 'master.'
> 
>  tools/mkenvimage.c |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 9c32f4a..3bb471d 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>
@@ -79,6 +82,9 @@  int main(int argc, char **argv)
 	struct stat txt_file_stat;
 
 	int fp, ep;
+	const char *prg;
+
+	prg = basename(argv[0]);
 
 	/* Parse the cmdline */
 	while ((option = getopt(argc, argv, "s:o:rbp:h")) != -1) {
@@ -104,11 +110,11 @@  int main(int argc, char **argv)
 			padbyte = strtol(optarg, NULL, 0);
 			break;
 		case 'h':
-			usage(argv[0]);
+			usage(prg);
 			return EXIT_SUCCESS;
 		default:
 			fprintf(stderr, "Wrong option -%c\n", option);
-			usage(argv[0]);
+			usage(prg);
 			return EXIT_FAILURE;
 		}
 	}
@@ -118,7 +124,7 @@  int main(int argc, char **argv)
 		fprintf(stderr,
 			"Please specify the size of the envrionnment "
 			"partition.\n");
-		usage(argv[0]);
+		usage(prg);
 		return EXIT_FAILURE;
 	}