test-wildmatch: avoid Windows path mangling
The MSYS bash mangles arguments that begin with a forward slash when they are passed to test-wildmatch. This causes tests to fail. Avoid mangling by prepending "XXX", which is removed by test-wildmatch before further processing. [J6t: reworded commit message] Reported-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
parent
237ec6e40d
commit
ef49841ddf
@ -74,7 +74,7 @@ match 0 0 'foo/bar' 'foo[/]bar'
|
||||
match 0 0 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
|
||||
match 1 1 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
|
||||
match 1 0 'foo' '**/foo'
|
||||
match 1 x '/foo' '**/foo'
|
||||
match 1 x 'XXX/foo' '**/foo'
|
||||
match 1 0 'bar/baz/foo' '**/foo'
|
||||
match 0 0 'bar/baz/foo' '*/foo'
|
||||
match 0 0 'foo/bar/baz' '**/bar*'
|
||||
@ -95,8 +95,8 @@ match 0 0 ']' '[!]-]'
|
||||
match 1 x 'a' '[!]-]'
|
||||
match 0 0 '' '\'
|
||||
match 0 x '\' '\'
|
||||
match 0 x '/\' '*/\'
|
||||
match 1 x '/\' '*/\\'
|
||||
match 0 x 'XXX/\' '*/\'
|
||||
match 1 x 'XXX/\' '*/\\'
|
||||
match 1 1 'foo' 'foo'
|
||||
match 1 1 '@foo' '@foo'
|
||||
match 0 0 'foo' '@foo'
|
||||
@ -187,8 +187,8 @@ match 0 0 '-' '[[-\]]'
|
||||
match 1 1 '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
|
||||
match 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
|
||||
match 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
|
||||
match 1 1 '/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' '/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
|
||||
match 0 0 '/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' '/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
|
||||
match 1 1 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
|
||||
match 0 0 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
|
||||
match 1 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
|
||||
match 0 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
|
||||
|
||||
|
@ -3,6 +3,14 @@
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
for (i = 2; i < argc; i++) {
|
||||
if (argv[i][0] == '/')
|
||||
die("Forward slash is not allowed at the beginning of the\n"
|
||||
"pattern because Windows does not like it. Use `XXX/' instead.");
|
||||
else if (!strncmp(argv[i], "XXX/", 4))
|
||||
argv[i] += 3;
|
||||
}
|
||||
if (!strcmp(argv[1], "wildmatch"))
|
||||
return !!wildmatch(argv[3], argv[2], 0);
|
||||
else if (!strcmp(argv[1], "iwildmatch"))
|
||||
|
Loading…
Reference in New Issue
Block a user