Merge pull request #1611 from masatake/convert-slash-to-backslash-in-…

…exclude-option

Convert slash to backslash in exclude option

Tmain/ptag-kind-desc.d/run.sh

@@ -3,7 +3,7 @@
 
 CTAGS=$1
 
-source ../utils.sh
+. ../utils.sh
 
 {
     echo '# BUILTIN'

Tmain/utils.sh

@@ -48,6 +48,11 @@ exit_if_win32()
 	is_feature_available $1 '!' win32
 }
 
+exit_unless_win32()
+{
+	is_feature_available $1 win32
+}
+
 exit_if_no_case_insensitive_filenames()
 {
 	is_feature_available $1 case-insensitive-filenames

Tmain/w32-slash-in-exclude-option.d/input.d/capture_me/input.c

@@ -0,0 +1,4 @@
+int capture_me_1(void)
+{
+	return 0;
+}

Tmain/w32-slash-in-exclude-option.d/input.d/dont_capture_me/input.c

@@ -0,0 +1,4 @@
+int dont_capture_me(void)
+{
+	return 0;
+}

Tmain/w32-slash-in-exclude-option.d/input.d/input.c

@@ -0,0 +1,4 @@
+int capture_me_0(void)
+{
+	return 0;
+}

Tmain/w32-slash-in-exclude-option.d/run.sh

@@ -0,0 +1,11 @@
+# Copyright: 2017 Masatake YAMATO
+# License: GPL-2
+
+CTAGS=$1
+
+. ../utils.sh
+
+exit_unless_win32 "$CTAGS"
+
+MSYS2_ARG_CONV_EXCL=dont_capture_me/input.c ${CTAGS} --quiet --options=NONE -R -o - \
+		 --exclude='input.d/dont_capture_me/input.c' input.d

Tmain/w32-slash-in-exclude-option.d/stdout-expected.txt

@@ -0,0 +1,2 @@
+capture_me_0	input.d\\input.c	/^int capture_me_0(void)$/;"	f	typeref:typename:int
+capture_me_1	input.d\\capture_me\\input.c	/^int capture_me_1(void)$/;"	f	typeref:typename:int

main/options.c

@@ -1108,6 +1108,9 @@ static void processExcludeOption (
 	else
 	{
 		vString *const item = vStringNewInit (parameter);
+#if defined (WIN32)
+		vStringTranslate(item, '\\', '/');
+#endif
 		if (Excluded == NULL)
 			Excluded = stringListNew ();
 		stringListAdd (Excluded, item);

main/strlist.c

@@ -243,11 +243,24 @@ extern vString* stringListFileFinds (
 	vString* vstr = NULL;
 	bool matched = false;
 	unsigned int i;
+	const char * normalized = fileName;
+
+#if defined (WIN32)
+	vString *tmp = vStringNewInit (fileName);
+	vStringTranslate (tmp, '\\', '/');
+	normalized = vStringValue (tmp);
+#endif
+
 	for (i = 0  ;  ! matched  &&  i < stringListCount (current)  ;  ++i)
 	{
 		vstr = stringListItem (current, i);
-		matched = fileNameMatched (vstr, fileName);
+		matched = fileNameMatched (vstr, normalized);
 	}
+
+#if defined (WIN32) && defined (UNIX_PATH_SEPARATOR)
+	vStringDelete (tmp);
+#endif
+
 	return matched? vstr: NULL;
 }
 

main/vstring.c

@@ -369,3 +369,12 @@ extern vString *vStringNewOrClearWithAutoRelease (vString *const string)
 
 	return r;
 }
+
+extern void vStringTranslate(vString *const string, char fromC, char toC)
+{
+	for (int i = 0; i < vStringLength(string); i++)
+	{
+		if (string->buffer[i] == fromC)
+			string->buffer[i] = toC;
+	}
+}

main/vstring.h

@@ -76,6 +76,7 @@ extern void vStringNCopyS (vString *const string, const char *const s, const siz
 extern void vStringCopyToLower (vString *const dest, const vString *const src);
 extern void vStringSetLength (vString *const string);
 extern void vStringTruncate (vString *const string, const size_t length);
+extern void vStringTranslate(vString *const string, char fromC, char toC);
 
 extern vString *vStringNewOrClear (vString *const string);
 extern vString *vStringNewOrClearWithAutoRelease (vString *const string);