summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExplorer09 <explorer09@gmail.com>2017-07-18 22:37:19 +0800
committerWill Estes <westes575@gmail.com>2017-08-24 08:34:23 -0400
commitfb731ac0221e1866534dfe072b84b8af7a5d88f3 (patch)
treecb7c3345fa23aac5ca84da235d88da2728b2831d
parentd64a5263cfcd490a6a96b2d6c018fa40f1ed558a (diff)
scanner: remove BASENAME(); don't strip path from program_name
There's no technical need of stripping path from program_name. I think the users should be fine if they see the path they use to invoke flex is diagnostic messages and help texts. Yes, users will see "Usage: ../flex [OPTIONS]..." now if they invoke flex with the path "../flex". The --version output has been changed so that the name field will be always "flex" or "flex++". If the flex program has been renamed to "lex" (for compatibility or other reason) this will allow identifying the implementation name ("flex"). (And it's a recommended practice in GNU Coding Standards)
-rw-r--r--src/main.c4
-rw-r--r--src/scanopt.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index e3ca440..963d2d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -996,7 +996,7 @@ void flexinit (int argc, char **argv)
flex_init_regex();
/* Enable C++ if program name ends with '+'. */
- program_name = BASENAME(argv[0]);
+ program_name = argv[0];
if (program_name != NULL &&
program_name[strlen (program_name) - 1] == '+')
@@ -1208,7 +1208,7 @@ void flexinit (int argc, char **argv)
break;
case OPT_VERSION:
- printf (_("%s %s\n"), program_name, flex_version);
+ printf (_("%s %s\n"), (C_plus_plus ? "flex++" : "flex"), flex_version);
FLEX_EXIT (0);
case OPT_WARN:
diff --git a/src/scanopt.c b/src/scanopt.c
index 3162e9f..7745c11 100644
--- a/src/scanopt.c
+++ b/src/scanopt.c
@@ -247,7 +247,7 @@ int scanopt_usage (scanopt_t *scanner, FILE *fp, const char *usage)
fprintf (fp, "%s\n", usage);
}
else {
- fprintf (fp, _("Usage: %s [OPTIONS]...\n"), BASENAME(s->argv[0]) );
+ fprintf (fp, _("Usage: %s [OPTIONS]...\n"), s->argv[0]);
}
fprintf (fp, "\n");