From d440dc05135bc93a4e95d07f4d7cd7bf2710408f Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 2 Apr 2014 20:31:18 +0300
Subject: [PATCH] unix: Use argv[0] for command name in usage.
---
unix/main.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/unix/main.c b/unix/main.c
index 029a8effa..228c4746a 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -213,11 +213,11 @@ mp_obj_t test_obj_new(int value) {
return o;
}
-int usage(void) {
+int usage(char **argv) {
printf(
-"usage: py [-X <opt>] [-c <command>] [<filename>]\n"
+"usage: %s [-X <opt>] [-c <command>] [<filename>]\n"
"\n"
-"Implementation specific options:\n"
+"Implementation specific options:\n", argv[0]
);
int impl_opts_cnt = 0;
#if MICROPY_ENABLE_GC
@@ -261,7 +261,7 @@ void pre_process_options(int argc, char **argv) {
if (argv[a][0] == '-') {
if (strcmp(argv[a], "-X") == 0) {
if (a + 1 >= argc) {
- exit(usage());
+ exit(usage(argv));
}
if (0) {
#if MICROPY_ENABLE_GC
@@ -269,7 +269,7 @@ void pre_process_options(int argc, char **argv) {
heap_size = strtol(argv[a + 1] + sizeof("heapsize=") - 1, NULL, 0);
#endif
} else {
- exit(usage());
+ exit(usage(argv));
}
a++;
}
@@ -370,7 +370,7 @@ int main(int argc, char **argv) {
if (argv[a][0] == '-') {
if (strcmp(argv[a], "-c") == 0) {
if (a + 1 >= argc) {
- return usage();
+ return usage(argv);
}
do_str(argv[a + 1]);
executed = true;
@@ -378,7 +378,7 @@ int main(int argc, char **argv) {
} else if (strcmp(argv[a], "-X") == 0) {
a += 1;
} else {
- return usage();
+ return usage(argv);
}
} else {
char *basedir = realpath(argv[a], NULL);
--
GitLab