[U-Boot] [PATCH 3/4] mkenvimage: Print program basename instead of whole path in usage()

Horst Kronstorfer hkronsto at frequentis.com
Mon Dec 5 11:55:25 CET 2011


Signed-off-by: Horst Kronstorfer <hkronsto at frequentis.com>
---
 tools/mkenvimage.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 22d1b88..3e7f967 100644
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -79,6 +79,11 @@ int main(int argc, char **argv)
 	struct stat txt_file_stat;
 
 	int fp, ep;
+	const char *prg;
+
+	/* Parse program basename */
+	prg = strrchr(argv[0], '/');
+	prg = (prg) ? prg + 1 : argv[0];
 
 	/* Turn off getopt()'s internal error message */
 	opterr = 0;
@@ -107,16 +112,16 @@ int main(int argc, char **argv)
 			padbyte = strtol(optarg, NULL, 0);
 			break;
 		case 'h':
-			usage(argv[0]);
+			usage(prg);
 			return EXIT_SUCCESS;
 		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;
 		}
 	}
@@ -126,7 +131,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;
 	}
 
-- 
1.7.7.3



More information about the U-Boot mailing list