Author: pfg Date: Tue Oct 10 21:04:40 2017 New Revision: 324505 URL: https://svnweb.freebsd.org/changeset/base/324505
Log: MFC r322368, r322371: fnmatch(3): improve POSIX conformance. In a recent interpretation[1], "\\" shall return a non-zero value (indicating either no match or an error). The fix involves a change over r254091 and now the behavior matches the Sun/IBM/HP closed source implementations and also likely musl libc. Submitted by: Joerg Schilling <joerg at schily.net> [1] http://austingroupbugs.net/view.php?id=806 Modified: stable/10/lib/libc/gen/fnmatch.c stable/10/lib/libc/tests/gen/fnmatch_testcases.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/fnmatch.c ============================================================================== --- stable/10/lib/libc/gen/fnmatch.c Tue Oct 10 20:45:45 2017 (r324504) +++ stable/10/lib/libc/gen/fnmatch.c Tue Oct 10 21:04:40 2017 (r324505) @@ -188,7 +188,8 @@ fnmatch1(pattern, string, stringstart, flags, patmbs, if (!(flags & FNM_NOESCAPE)) { pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs); - if (pclen == (size_t)-1 || pclen == (size_t)-2) + if (pclen == 0 || pclen == (size_t)-1 || + pclen == (size_t)-2) return (FNM_NOMATCH); pattern += pclen; } Modified: stable/10/lib/libc/tests/gen/fnmatch_testcases.h ============================================================================== --- stable/10/lib/libc/tests/gen/fnmatch_testcases.h Tue Oct 10 20:45:45 2017 (r324504) +++ stable/10/lib/libc/tests/gen/fnmatch_testcases.h Tue Oct 10 21:04:40 2017 (r324505) @@ -131,7 +131,7 @@ struct testcase { { "\\(", "\\(", 0, FNM_NOMATCH }, { "\\a", "\\a", 0, FNM_NOMATCH }, { "\\", "\\", 0, FNM_NOMATCH }, - { "\\", "", 0, 0 }, + { "\\", "", 0, FNM_NOMATCH }, { "\\*", "\\*", FNM_NOESCAPE, 0 }, { "\\?", "\\?", FNM_NOESCAPE, 0 }, { "\\", "\\", FNM_NOESCAPE, 0 }, _______________________________________________ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
