Merge pull request #4328 from masatake/misc-fixes

masatake · web-flow · commit cea36d3c2e65 · 2025-10-27T20:07:19.000+09:00
Misc fixes
diff --git a/Tmain/map-removing.d/run.sh b/Tmain/map-removing.d/run.sh
@@ -49,3 +49,18 @@ ${CTAGS} --quiet --options=NONE   \
 	 --guess-language-eagerly \
 	 ada.m matlab.m objc.m
 echo
+
+X=xxxyyyzzz
+echo 'Removing multi extension entries'
+${CTAGS} --quiet --options=NONE   \
+	 --map-Pascal=.$X \
+	 --map-Fortran=.$X \
+	 --langmap=C:.$X \
+	 --list-maps | grep $X
+
+echo 'Removing multi pattern entries'
+${CTAGS} --quiet --options=NONE   \
+	 --map-Pascal='('$X')' \
+	 --map-Fortran='('$X')' \
+	 --langmap=C:'('$X')' \
+	 --list-maps | grep $X
diff --git a/Tmain/map-removing.d/stdout-expected.txt b/Tmain/map-removing.d/stdout-expected.txt
@@ -30,3 +30,7 @@ ada.m: Ada
 matlab.m: MatLab
 objc.m: ObjectiveC
 
+Removing multi extension entries
+C        *.xxxyyyzzz
+Removing multi pattern entries
+C        xxxyyyzzz
diff --git a/docs/man/ctags.1.rst b/docs/man/ctags.1.rst
@@ -1060,7 +1060,7 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in :ref:`ctags-client-tools(7) <ctags-client-tools(7)>` about the ctags output
 		version.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the extra.
@@ -1115,7 +1115,7 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in :ref:`ctags-client-tools(7) <ctags-client-tools(7)>` about the ctags output
 		version.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the field.
@@ -1213,7 +1213,7 @@ Listing Options
 	VER
 		The parser version introducing the kind.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the kind.
@@ -1267,7 +1267,7 @@ Listing Options
 	``NULLTAG`` column represetns whether the format supports *null tags* or
 	not. See ``nulltag``/``z`` in "`Extras`_" about the null tags.
 
-	(since verison 6.2.0)
+	(since version 6.2.0)
 
 ``--list-params[=(<language>|all)]``
 	Lists the parameters for either the specified *<language>* or ``all``
@@ -1307,7 +1307,7 @@ Listing Options
 	VER
 		The parser version introducing the role.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the role.
@@ -1334,7 +1334,7 @@ Miscellaneous Options
 ``--describe-language=<language>``
 	Prints the various aspects of the parser implementing the language.
 
-	(since verison 6.3.0)
+	(since version 6.3.0)
 
 ``--help``
 	Prints to standard output a detailed usage description, and then exits.
diff --git a/extra-cmds/utiltest.c b/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 },
diff --git a/main/lregex-default.c b/main/lregex-default.c
@@ -106,7 +106,7 @@ static regexCompiledCode compile (struct regexBackend *backend,
 	if (errcode != 0)
 	{
 		char errmsg[256];
-		regerror (errcode, regex_code, errmsg, 256);
+		regerror (errcode, regex_code, errmsg, sizeof(errmsg));
 		error (WARNING, "regcomp: %s", errmsg);
 		regfree (regex_code);
 		eFree (regex_code);
diff --git a/main/parse.c b/main/parse.c
@@ -1740,7 +1740,7 @@ extern bool removeLanguagePatternMap (const langType language, const char *const
 	if (language == LANG_AUTO)
 	{
 		unsigned int i;
-		for (i = 0  ;  i < LanguageCount  &&  ! result ;  ++i)
+		for (i = 0  ;  i < LanguageCount ;  ++i)
 			result = removeLanguagePatternMap1 (i, pattern) || result;
 	}
 	else
diff --git a/main/routines.c b/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))
 	{
diff --git a/main/writer.c b/main/writer.c
@@ -21,14 +21,18 @@ extern tagWriter uCtagsWriter;
 extern tagWriter eCtagsWriter;
 extern tagWriter etagsWriter;
 extern tagWriter xrefWriter;
+#ifdef HAVE_JANSSON
 extern tagWriter jsonWriter;
+#endif
 
 static tagWriter *writerTable [WRITER_COUNT] = {
 	[WRITER_U_CTAGS] = &uCtagsWriter,
 	[WRITER_E_CTAGS] = &eCtagsWriter,
 	[WRITER_ETAGS] = &etagsWriter,
 	[WRITER_XREF]  = &xrefWriter,
+#ifdef HAVE_JANSSON
 	[WRITER_JSON]  = &jsonWriter,
+#endif
 	[WRITER_CUSTOM] = NULL,
 };
 
diff --git a/main/writer_p.h b/main/writer_p.h
@@ -27,7 +27,9 @@ typedef enum eWriterType {
 	WRITER_E_CTAGS,
 	WRITER_ETAGS,
 	WRITER_XREF,
+#ifdef HAVE_JANSSON
 	WRITER_JSON,
+#endif
 	WRITER_CUSTOM,
 	WRITER_COUNT,
 } writerType;
diff --git a/man/ctags.1.rst.in b/man/ctags.1.rst.in
@@ -1060,7 +1060,7 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in ctags-client-tools(7) about the ctags output
 		version.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the extra.
@@ -1115,7 +1115,7 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in ctags-client-tools(7) about the ctags output
 		version.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the field.
@@ -1213,7 +1213,7 @@ Listing Options
 	VER
 		The parser version introducing the kind.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the kind.
@@ -1267,7 +1267,7 @@ Listing Options
 	``NULLTAG`` column represetns whether the format supports *null tags* or
 	not. See ``nulltag``/``z`` in "`Extras`_" about the null tags.
 
-	(since verison 6.2.0)
+	(since version 6.2.0)
 
 ``--list-params[=(<language>|all)]``
 	Lists the parameters for either the specified *<language>* or ``all``
@@ -1307,7 +1307,7 @@ Listing Options
 	VER
 		The parser version introducing the role.
 
-		(since verison 6.3.0)
+		(since version 6.3.0)
 
 	DESCRIPTION
 		Human readable description for the role.
@@ -1334,7 +1334,7 @@ Miscellaneous Options
 ``--describe-language=<language>``
 	Prints the various aspects of the parser implementing the language.
 
-	(since verison 6.3.0)
+	(since version 6.3.0)
 
 ``--help``
 	Prints to standard output a detailed usage description, and then exits.
diff --git a/misc/optlib2c b/misc/optlib2c
@@ -915,7 +915,6 @@ sub escape_as_cstr {
 sub emit_roledefs {
     my $opts = shift;
 
-
     for (@{$opts->{'kinddefs'}}) {
 	next unless @{$_->{'roles'}};
 	my $Kind = capitalize($_->{'name'});

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ static regexCompiledCode compile (struct regexBackend *backend,`
`106`	`106`	`if (errcode != 0)`
`107`	`107`	`{`
`108`	`108`	`char errmsg[256];`
`109`		`- regerror (errcode, regex_code, errmsg, 256);`
	`109`	`+ regerror (errcode, regex_code, errmsg, sizeof(errmsg));`
`110`	`110`	`error (WARNING, "regcomp: %s", errmsg);`
`111`	`111`	`regfree (regex_code);`
`112`	`112`	`eFree (regex_code);`
Original file line number	Diff line number	Diff line change
`@@ -1740,7 +1740,7 @@ extern bool removeLanguagePatternMap (const langType language, const char *const`
`1740`	`1740`	`if (language == LANG_AUTO)`
`1741`	`1741`	`{`
`1742`	`1742`	`unsigned int i;`
`1743`		`- for (i = 0 ; i < LanguageCount && ! result ; ++i)`
	`1743`	`+ for (i = 0 ; i < LanguageCount ; ++i)`
`1744`	`1744`	`result = removeLanguagePatternMap1 (i, pattern) \|\| result;`
`1745`	`1745`	`}`
`1746`	`1746`	`else`
Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ extern char* baseFilenameSansExtensionNew (const char *const fileName,`
`664`	`664`	`const char *const base = baseFilename (fileName);`
`665`	`665`	`char* shorten_base;`
`666`	`666`
`667`		`- pDelimiter = strrchr (base, templateExt[0]);`
	`667`	`+ pDelimiter = strrstr (base, templateExt);`
`668`	`668`
`669`	`669`	`if (pDelimiter && (strcmp (pDelimiter, templateExt) == 0))`
`670`	`670`	`{`