Simplify basename2().

It's only call site does not activate the `strip_ext` code path, so the
function can be simplified a lot.  While here, remove a double
assignment.

1 files changed, 4 insertions, 10 deletions

diff --git a/src/main.c b/src/main.c
index 24e61fc..2a0ff02 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,7 +44,7 @@ static char flex_version[] = FLEX_VERSION;
 void flexinit(int, char **);
 void readin(void);
 void set_up_initial_allocations(void);
-static char *basename2(char *path, int should_strip_ext);
+static char *basename2(char *path);
 
 
 /* these globals are all defined and commented in flexdef.h */
@@ -1000,7 +1000,7 @@ void flexinit (int argc, char **argv)
     flex_init_regex();
 
 	/* Enable C++ if program name ends with '+'. */
-	program_name = basename2 (argv[0], 0);
+	program_name = basename2 (argv[0]);
 
 	if (program_name[0] != '\0' &&
 	    program_name[strlen (program_name) - 1] == '+')
@@ -1793,19 +1793,13 @@ void set_up_initial_allocations (void)
 
 /* extracts basename from path, optionally stripping the extension "\.*"
  * (same concept as /bin/sh `basename`, but different handling of extension). */
-static char *basename2 (char *path, int /* boolean */ strip_ext)
+static char *basename2 (char *path)
 {
-	char   *b, *e = 0;
+	char   *b;
 
-	b = path;
 	for (b = path; *path; path++)
 		if (*path == '/')
 			b = path + 1;
-		else if (*path == '.')
-			e = path;
-
-	if (strip_ext && e && e > b)
-		*e = '\0';
 	return b;
 }