Update bsdcpio to 2.8.4

Use common code from lib/libarchive/libarchive_fe

Approved by:	kientzle
MFC after:	2 weeks

1 files changed, 140 insertions, 140 deletions

diff --git a/usr.bin/cpio/test/test_pathmatch.c b/usr.bin/cpio/test/test_pathmatch.c
index a596eda1daec..177c2bcc4af4 100644
--- a/usr.bin/cpio/test/test_pathmatch.c
+++ b/usr.bin/cpio/test/test_pathmatch.c
@@ -25,7 +25,7 @@
 #include "test.h"
 __FBSDID("$FreeBSD$");
 
-#include "../pathmatch.h"
+#include "pathmatch.h"
 
 /*
  * Verify that the pattern matcher implements the wildcard logic specified
@@ -45,126 +45,126 @@ __FBSDID("$FreeBSD$");
 
 DEFINE_TEST(test_pathmatch)
 {
-	assertEqualInt(1, pathmatch("a/b/c", "a/b/c", 0));
-	assertEqualInt(0, pathmatch("a/b/", "a/b/c", 0));
-	assertEqualInt(0, pathmatch("a/b", "a/b/c", 0));
-	assertEqualInt(0, pathmatch("a/b/c", "a/b/", 0));
-	assertEqualInt(0, pathmatch("a/b/c", "a/b", 0));
+	assertEqualInt(1, lafe_pathmatch("a/b/c", "a/b/c", 0));
+	assertEqualInt(0, lafe_pathmatch("a/b/", "a/b/c", 0));
+	assertEqualInt(0, lafe_pathmatch("a/b", "a/b/c", 0));
+	assertEqualInt(0, lafe_pathmatch("a/b/c", "a/b/", 0));
+	assertEqualInt(0, lafe_pathmatch("a/b/c", "a/b", 0));
 
 	/* Empty pattern only matches empty string. */
-	assertEqualInt(1, pathmatch("","", 0));
-	assertEqualInt(0, pathmatch("","a", 0));
-	assertEqualInt(1, pathmatch("*","", 0));
-	assertEqualInt(1, pathmatch("*","a", 0));
-	assertEqualInt(1, pathmatch("*","abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("","", 0));
+	assertEqualInt(0, lafe_pathmatch("","a", 0));
+	assertEqualInt(1, lafe_pathmatch("*","", 0));
+	assertEqualInt(1, lafe_pathmatch("*","a", 0));
+	assertEqualInt(1, lafe_pathmatch("*","abcd", 0));
 	/* SUSv2: * matches / */
-	assertEqualInt(1, pathmatch("*","abcd/efgh/ijkl", 0));
-	assertEqualInt(1, pathmatch("abcd*efgh/ijkl","abcd/efgh/ijkl", 0));
-	assertEqualInt(1, pathmatch("abcd***efgh/ijkl","abcd/efgh/ijkl", 0));
-	assertEqualInt(1, pathmatch("abcd***/efgh/ijkl","abcd/efgh/ijkl", 0));
-	assertEqualInt(0, pathmatch("?", "", 0));
-	assertEqualInt(0, pathmatch("?", "\0", 0));
-	assertEqualInt(1, pathmatch("?", "a", 0));
-	assertEqualInt(0, pathmatch("?", "ab", 0));
-	assertEqualInt(1, pathmatch("?", ".", 0));
-	assertEqualInt(1, pathmatch("?", "?", 0));
-	assertEqualInt(1, pathmatch("a", "a", 0));
-	assertEqualInt(0, pathmatch("a", "ab", 0));
-	assertEqualInt(0, pathmatch("a", "ab", 0));
-	assertEqualInt(1, pathmatch("a?c", "abc", 0));
+	assertEqualInt(1, lafe_pathmatch("*","abcd/efgh/ijkl", 0));
+	assertEqualInt(1, lafe_pathmatch("abcd*efgh/ijkl","abcd/efgh/ijkl", 0));
+	assertEqualInt(1, lafe_pathmatch("abcd***efgh/ijkl","abcd/efgh/ijkl", 0));
+	assertEqualInt(1, lafe_pathmatch("abcd***/efgh/ijkl","abcd/efgh/ijkl", 0));
+	assertEqualInt(0, lafe_pathmatch("?", "", 0));
+	assertEqualInt(0, lafe_pathmatch("?", "\0", 0));
+	assertEqualInt(1, lafe_pathmatch("?", "a", 0));
+	assertEqualInt(0, lafe_pathmatch("?", "ab", 0));
+	assertEqualInt(1, lafe_pathmatch("?", ".", 0));
+	assertEqualInt(1, lafe_pathmatch("?", "?", 0));
+	assertEqualInt(1, lafe_pathmatch("a", "a", 0));
+	assertEqualInt(0, lafe_pathmatch("a", "ab", 0));
+	assertEqualInt(0, lafe_pathmatch("a", "ab", 0));
+	assertEqualInt(1, lafe_pathmatch("a?c", "abc", 0));
 	/* SUSv2: ? matches / */
-	assertEqualInt(1, pathmatch("a?c", "a/c", 0));
-	assertEqualInt(1, pathmatch("a?*c*", "a/c", 0));
-	assertEqualInt(1, pathmatch("*a*", "a/c", 0));
-	assertEqualInt(1, pathmatch("*a*", "/a/c", 0));
-	assertEqualInt(1, pathmatch("*a*", "defaaaaaaa", 0));
-	assertEqualInt(0, pathmatch("a*", "defghi", 0));
-	assertEqualInt(0, pathmatch("*a*", "defghi", 0));
+	assertEqualInt(1, lafe_pathmatch("a?c", "a/c", 0));
+	assertEqualInt(1, lafe_pathmatch("a?*c*", "a/c", 0));
+	assertEqualInt(1, lafe_pathmatch("*a*", "a/c", 0));
+	assertEqualInt(1, lafe_pathmatch("*a*", "/a/c", 0));
+	assertEqualInt(1, lafe_pathmatch("*a*", "defaaaaaaa", 0));
+	assertEqualInt(0, lafe_pathmatch("a*", "defghi", 0));
+	assertEqualInt(0, lafe_pathmatch("*a*", "defghi", 0));
 
 	/* Character classes */
-	assertEqualInt(1, pathmatch("abc[def", "abc[def", 0));
-	assertEqualInt(0, pathmatch("abc[def]", "abc[def", 0));
-	assertEqualInt(0, pathmatch("abc[def", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[def]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[def]", "abce", 0));
-	assertEqualInt(1, pathmatch("abc[def]", "abcf", 0));
-	assertEqualInt(0, pathmatch("abc[def]", "abcg", 0));
-	assertEqualInt(1, pathmatch("abc[d*f]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[d*f]", "abc*", 0));
-	assertEqualInt(0, pathmatch("abc[d*f]", "abcdefghi", 0));
-	assertEqualInt(0, pathmatch("abc[d*", "abcdefghi", 0));
-	assertEqualInt(1, pathmatch("abc[d*", "abc[defghi", 0));
-	assertEqualInt(1, pathmatch("abc[d-f]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[d-f]", "abce", 0));
-	assertEqualInt(1, pathmatch("abc[d-f]", "abcf", 0));
-	assertEqualInt(0, pathmatch("abc[d-f]", "abcg", 0));
-	assertEqualInt(0, pathmatch("abc[d-fh-k]", "abca", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abce", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abcf", 0));
-	assertEqualInt(0, pathmatch("abc[d-fh-k]", "abcg", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abch", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abci", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abcj", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-k]", "abck", 0));
-	assertEqualInt(0, pathmatch("abc[d-fh-k]", "abcl", 0));
-	assertEqualInt(0, pathmatch("abc[d-fh-k]", "abc-", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[def", "abc[def", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[def]", "abc[def", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[def", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[def]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[def]", "abce", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[def]", "abcf", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[def]", "abcg", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d*f]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d*f]", "abc*", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d*f]", "abcdefghi", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d*", "abcdefghi", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d*", "abc[defghi", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-f]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-f]", "abce", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-f]", "abcf", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d-f]", "abcg", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d-fh-k]", "abca", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abce", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abcf", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d-fh-k]", "abcg", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abch", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abci", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abcj", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-k]", "abck", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d-fh-k]", "abcl", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d-fh-k]", "abc-", 0));
 
 	/* [] matches nothing, [!] is the same as ? */
-	assertEqualInt(0, pathmatch("abc[]efg", "abcdefg", 0));
-	assertEqualInt(0, pathmatch("abc[]efg", "abcqefg", 0));
-	assertEqualInt(0, pathmatch("abc[]efg", "abcefg", 0));
-	assertEqualInt(1, pathmatch("abc[!]efg", "abcdefg", 0));
-	assertEqualInt(1, pathmatch("abc[!]efg", "abcqefg", 0));
-	assertEqualInt(0, pathmatch("abc[!]efg", "abcefg", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[]efg", "abcdefg", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[]efg", "abcqefg", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[]efg", "abcefg", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[!]efg", "abcdefg", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[!]efg", "abcqefg", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[!]efg", "abcefg", 0));
 
 	/* I assume: Trailing '-' is non-special. */
-	assertEqualInt(0, pathmatch("abc[d-fh-]", "abcl", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-]", "abch", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-]", "abc-", 0));
-	assertEqualInt(1, pathmatch("abc[d-fh-]", "abc-", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d-fh-]", "abcl", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-]", "abch", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-]", "abc-", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-fh-]", "abc-", 0));
 
 	/* ']' can be backslash-quoted within a character class. */
-	assertEqualInt(1, pathmatch("abc[\\]]", "abc]", 0));
-	assertEqualInt(1, pathmatch("abc[\\]d]", "abc]", 0));
-	assertEqualInt(1, pathmatch("abc[\\]d]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[d\\]]", "abc]", 0));
-	assertEqualInt(1, pathmatch("abc[d\\]]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[d]e]", "abcde]", 0));
-	assertEqualInt(1, pathmatch("abc[d\\]e]", "abc]", 0));
-	assertEqualInt(0, pathmatch("abc[d\\]e]", "abcd]e", 0));
-	assertEqualInt(0, pathmatch("abc[d]e]", "abc]", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[\\]]", "abc]", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[\\]d]", "abc]", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[\\]d]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d\\]]", "abc]", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d\\]]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d]e]", "abcde]", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d\\]e]", "abc]", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d\\]e]", "abcd]e", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d]e]", "abc]", 0));
 
 	/* backslash-quoted chars can appear as either end of a range. */
-	assertEqualInt(1, pathmatch("abc[\\d-f]gh", "abcegh", 0));
-	assertEqualInt(0, pathmatch("abc[\\d-f]gh", "abcggh", 0));
-	assertEqualInt(0, pathmatch("abc[\\d-f]gh", "abc\\gh", 0));
-	assertEqualInt(1, pathmatch("abc[d-\\f]gh", "abcegh", 0));
-	assertEqualInt(1, pathmatch("abc[\\d-\\f]gh", "abcegh", 0));
-	assertEqualInt(1, pathmatch("abc[\\d-\\f]gh", "abcegh", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[\\d-f]gh", "abcegh", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[\\d-f]gh", "abcggh", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[\\d-f]gh", "abc\\gh", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d-\\f]gh", "abcegh", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[\\d-\\f]gh", "abcegh", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[\\d-\\f]gh", "abcegh", 0));
 	/* backslash-quoted '-' isn't special. */
-	assertEqualInt(0, pathmatch("abc[d\\-f]gh", "abcegh", 0));
-	assertEqualInt(1, pathmatch("abc[d\\-f]gh", "abc-gh", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[d\\-f]gh", "abcegh", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[d\\-f]gh", "abc-gh", 0));
 
 	/* Leading '!' negates a character class. */
-	assertEqualInt(0, pathmatch("abc[!d]", "abcd", 0));
-	assertEqualInt(1, pathmatch("abc[!d]", "abce", 0));
-	assertEqualInt(1, pathmatch("abc[!d]", "abcc", 0));
-	assertEqualInt(0, pathmatch("abc[!d-z]", "abcq", 0));
-	assertEqualInt(1, pathmatch("abc[!d-gi-z]", "abch", 0));
-	assertEqualInt(1, pathmatch("abc[!fgijkl]", "abch", 0));
-	assertEqualInt(0, pathmatch("abc[!fghijkl]", "abch", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[!d]", "abcd", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[!d]", "abce", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[!d]", "abcc", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[!d-z]", "abcq", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[!d-gi-z]", "abch", 0));
+	assertEqualInt(1, lafe_pathmatch("abc[!fgijkl]", "abch", 0));
+	assertEqualInt(0, lafe_pathmatch("abc[!fghijkl]", "abch", 0));
 
 	/* Backslash quotes next character. */
-	assertEqualInt(0, pathmatch("abc\\[def]", "abc\\d", 0));
-	assertEqualInt(1, pathmatch("abc\\[def]", "abc[def]", 0));
-	assertEqualInt(0, pathmatch("abc\\\\[def]", "abc[def]", 0));
-	assertEqualInt(0, pathmatch("abc\\\\[def]", "abc\\[def]", 0));
-	assertEqualInt(1, pathmatch("abc\\\\[def]", "abc\\d", 0));
-	assertEqualInt(1, pathmatch("abcd\\", "abcd\\", 0));
-	assertEqualInt(0, pathmatch("abcd\\", "abcd\\[", 0));
-	assertEqualInt(0, pathmatch("abcd\\", "abcde", 0));
-	assertEqualInt(0, pathmatch("abcd\\[", "abcd\\", 0));
+	assertEqualInt(0, lafe_pathmatch("abc\\[def]", "abc\\d", 0));
+	assertEqualInt(1, lafe_pathmatch("abc\\[def]", "abc[def]", 0));
+	assertEqualInt(0, lafe_pathmatch("abc\\\\[def]", "abc[def]", 0));
+	assertEqualInt(0, lafe_pathmatch("abc\\\\[def]", "abc\\[def]", 0));
+	assertEqualInt(1, lafe_pathmatch("abc\\\\[def]", "abc\\d", 0));
+	assertEqualInt(1, lafe_pathmatch("abcd\\", "abcd\\", 0));
+	assertEqualInt(0, lafe_pathmatch("abcd\\", "abcd\\[", 0));
+	assertEqualInt(0, lafe_pathmatch("abcd\\", "abcde", 0));
+	assertEqualInt(0, lafe_pathmatch("abcd\\[", "abcd\\", 0));
 
 	/*
 	 * Because '.' and '/' have special meanings, we can
@@ -172,72 +172,72 @@ DEFINE_TEST(test_pathmatch)
 	 * differently.  (But quoting a character with '\\' suppresses
 	 * special meanings!)
 	 */
-	assertEqualInt(0, pathmatch("a/b/", "a/bc", 0));
-	assertEqualInt(1, pathmatch("a/./b", "a/b", 0));
-	assertEqualInt(0, pathmatch("a\\/./b", "a/b", 0));
-	assertEqualInt(0, pathmatch("a/\\./b", "a/b", 0));
-	assertEqualInt(0, pathmatch("a/.\\/b", "a/b", 0));
-	assertEqualInt(0, pathmatch("a\\/\\.\\/b", "a/b", 0));
-	assertEqualInt(1, pathmatch("./abc/./def/", "abc/def/", 0));
-	assertEqualInt(1, pathmatch("abc/def", "./././abc/./def", 0));
-	assertEqualInt(1, pathmatch("abc/def/././//", "./././abc/./def/", 0));
-	assertEqualInt(1, pathmatch(".////abc/.//def", "./././abc/./def", 0));
-	assertEqualInt(1, pathmatch("./abc?def/", "abc/def/", 0));
+	assertEqualInt(0, lafe_pathmatch("a/b/", "a/bc", 0));
+	assertEqualInt(1, lafe_pathmatch("a/./b", "a/b", 0));
+	assertEqualInt(0, lafe_pathmatch("a\\/./b", "a/b", 0));
+	assertEqualInt(0, lafe_pathmatch("a/\\./b", "a/b", 0));
+	assertEqualInt(0, lafe_pathmatch("a/.\\/b", "a/b", 0));
+	assertEqualInt(0, lafe_pathmatch("a\\/\\.\\/b", "a/b", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc/./def/", "abc/def/", 0));
+	assertEqualInt(1, lafe_pathmatch("abc/def", "./././abc/./def", 0));
+	assertEqualInt(1, lafe_pathmatch("abc/def/././//", "./././abc/./def/", 0));
+	assertEqualInt(1, lafe_pathmatch(".////abc/.//def", "./././abc/./def", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc?def/", "abc/def/", 0));
 	failure("\"?./\" is not the same as \"/./\"");
-	assertEqualInt(0, pathmatch("./abc?./def/", "abc/def/", 0));
+	assertEqualInt(0, lafe_pathmatch("./abc?./def/", "abc/def/", 0));
 	failure("Trailing '/' should match no trailing '/'");
-	assertEqualInt(1, pathmatch("./abc/./def/", "abc/def", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc/./def/", "abc/def", 0));
 	failure("Trailing '/./' is still the same directory.");
-	assertEqualInt(1, pathmatch("./abc/./def/./", "abc/def", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc/./def/./", "abc/def", 0));
 	failure("Trailing '/.' is still the same directory.");
-	assertEqualInt(1, pathmatch("./abc/./def/.", "abc/def", 0));
-	assertEqualInt(1, pathmatch("./abc/./def", "abc/def/", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc/./def/.", "abc/def", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc/./def", "abc/def/", 0));
 	failure("Trailing '/./' is still the same directory.");
-	assertEqualInt(1, pathmatch("./abc/./def", "abc/def/./", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc/./def", "abc/def/./", 0));
 	failure("Trailing '/.' is still the same directory.");
-	assertEqualInt(1, pathmatch("./abc*/./def", "abc/def/.", 0));
+	assertEqualInt(1, lafe_pathmatch("./abc*/./def", "abc/def/.", 0));
 
 	/* Matches not anchored at beginning. */
 	assertEqualInt(0,
-	    pathmatch("bcd", "abcd", PATHMATCH_NO_ANCHOR_START));
+	    lafe_pathmatch("bcd", "abcd", PATHMATCH_NO_ANCHOR_START));
 	assertEqualInt(1,
-	    pathmatch("abcd", "abcd", PATHMATCH_NO_ANCHOR_START));
+	    lafe_pathmatch("abcd", "abcd", PATHMATCH_NO_ANCHOR_START));
 	assertEqualInt(0,
-	    pathmatch("^bcd", "abcd", PATHMATCH_NO_ANCHOR_START));
+	    lafe_pathmatch("^bcd", "abcd", PATHMATCH_NO_ANCHOR_START));
 	assertEqualInt(1,
-	    pathmatch("b/c/d", "a/b/c/d", PATHMATCH_NO_ANCHOR_START));
+	    lafe_pathmatch("b/c/d", "a/b/c/d", PATHMATCH_NO_ANCHOR_START));
 	assertEqualInt(0,
-	    pathmatch("b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_START));
+	    lafe_pathmatch("b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_START));
 	assertEqualInt(0,
-	    pathmatch("^b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_START));
+	    lafe_pathmatch("^b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_START));
 
 	/* Matches not anchored at end. */
 	assertEqualInt(0,
-	    pathmatch("bcd", "abcd", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("bcd", "abcd", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("abcd", "abcd", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("abcd", "abcd", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("abcd", "abcd/", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("abcd", "abcd/", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("abcd", "abcd/.", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("abcd", "abcd/.", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(0,
-	    pathmatch("abc", "abcd", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("abc", "abcd", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("a/b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(0,
-	    pathmatch("a/b/c$", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c$", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("a/b/c$", "a/b/c", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c$", "a/b/c", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("a/b/c$", "a/b/c/", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c$", "a/b/c/", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("a/b/c/", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c/", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(0,
-	    pathmatch("a/b/c/$", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c/$", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("a/b/c/$", "a/b/c/", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c/$", "a/b/c/", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(1,
-	    pathmatch("a/b/c/$", "a/b/c", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("a/b/c/$", "a/b/c", PATHMATCH_NO_ANCHOR_END));
 	assertEqualInt(0,
-	    pathmatch("b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
+	    lafe_pathmatch("b/c", "a/b/c/d", PATHMATCH_NO_ANCHOR_END));
 }