main: fix a potential bug in the code making filename sans extension

baseFilenameSansExtensionNew("a.in.in", ".in.in") could not return
"a" with the original code.

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

extra-cmds/utiltest.c

@@ -13,6 +13,7 @@
 #include "intern.h"
 #include "numarray.h"
 #include "routines.h"
+#include "routines_p.h"
 #include "vstring.h"
 #include <string.h>
 
@@ -277,6 +278,31 @@ static void test_routines_strrstr(void)
 	TEST_CHECK(strcmp(strrstr("abcdcdb", "cd"), "cdb") == 0);
 }
 
+static void test_routines_baseFilenameSansExtensionNew(void)
+{
+	char *bs;
+
+	TEST_CHECK ((bs = baseFilenameSansExtensionNew ("a.in", ".in"))
+				&& strcmp(bs, "a") == 0);
+	if (bs)
+		eFree (bs);
+
+	TEST_CHECK ((bs = baseFilenameSansExtensionNew ("x/b.in", ".in"))
+				&& strcmp(bs, "b") == 0);
+	if (bs)
+		eFree (bs);
+
+	TEST_CHECK ((bs = baseFilenameSansExtensionNew ("c.in.in", ".in.in"))
+				&& strcmp(bs, "c") == 0);
+	if (bs)
+		eFree (bs);
+
+	TEST_CHECK ((bs = baseFilenameSansExtensionNew ("/y/d.in.in", ".in.in"))
+				&& strcmp(bs, "d") == 0);
+	if (bs)
+		eFree (bs);
+}
+
 static void test_vstring_ncats(void)
 {
 	vString *vstr = vStringNew ();
@@ -351,6 +377,7 @@ TEST_LIST = {
    { "intern",           test_intern           },
    { "numarray",         test_numarray         },
    { "routines/strrstr", test_routines_strrstr },
+   { "routines/baseFilenameSansExtensionNew", test_routines_baseFilenameSansExtensionNew },
    { "vstring/ncats",    test_vstring_ncats    },
    { "vstring/truncate_leading", test_vstring_truncate_leading },
    { "vstring/EqC",      test_vstring_eqc },

main/routines.c

@@ -664,7 +664,7 @@ extern char* baseFilenameSansExtensionNew (const char *const fileName,
 	const char *const base = baseFilename (fileName);
 	char* shorten_base;
 
-	pDelimiter = strrchr (base, templateExt[0]);
+	pDelimiter = strrstr (base, templateExt);
 
 	if (pDelimiter && (strcmp (pDelimiter, templateExt) == 0))
 	{