Merge "Simplify and improve tempnam() and tmpnam()."
diff --git a/apex/Android.bp b/apex/Android.bp
index 5bf078a..c97eb15 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -26,6 +26,9 @@
"libc_malloc_debug",
"libc_malloc_hooks",
],
+ binaries: [
+ "linkerconfig",
+ ],
multilib: {
both: {
binaries: [
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index 4e7d2af..7e49cde 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -218,12 +218,11 @@
fi
if [[ ${SKIP_GENERATION} -eq 0 ]]; then
- # Clean up any leftover headers.
- make distclean
-
# Build all of the generated headers.
for arch in "${ARCH_LIST[@]}"; do
echo "Generating headers for arch ${arch}"
+ # Clean up any leftover headers.
+ make ARCH=${arch} distclean
make ARCH=${arch} headers_install
done
fi
@@ -269,3 +268,12 @@
"${ANDROID_KERNEL_DIR}/scsi" \
"${KERNEL_DIR}"
echo "Headers updated."
+
+if [[ ${SKIP_GENERATION} -eq 0 ]]; then
+ cd "${KERNEL_DIR}"
+ # Clean all of the generated headers.
+ for arch in "${ARCH_LIST[@]}"; do
+ echo "Cleaning kernel files for arch ${arch}"
+ make ARCH=${arch} distclean
+ done
+fi
diff --git a/tests/Android.bp b/tests/Android.bp
index a7f6229..477c8fc 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -332,6 +332,7 @@
"fenv_test.cpp",
"_FILE_OFFSET_BITS_test.cpp",
"float_test.cpp",
+ "fnmatch_test.cpp",
"ftw_test.cpp",
"getauxval_test.cpp",
"getcwd_test.cpp",
diff --git a/tests/fnmatch_test.cpp b/tests/fnmatch_test.cpp
new file mode 100644
index 0000000..d28aefa
--- /dev/null
+++ b/tests/fnmatch_test.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <gtest/gtest.h>
+
+#include <fnmatch.h>
+
+TEST(fnmatch, basic) {
+ EXPECT_EQ(0, fnmatch("abc", "abc", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("abc", "abd", 0));
+}
+
+TEST(fnmatch, casefold) {
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("abc", "aBc", 0));
+ EXPECT_EQ(0, fnmatch("abc", "aBc", FNM_CASEFOLD));
+}
+
+TEST(fnmatch, character_class) {
+ // Literal.
+ EXPECT_EQ(0, fnmatch("ab[cd]", "abc", 0));
+ EXPECT_EQ(0, fnmatch("ab[cd]", "abd", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab[cd]", "abe", 0));
+
+ // Inverted literal.
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab[^cd]", "abc", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab[^cd]", "abd", 0));
+ EXPECT_EQ(0, fnmatch("ab[^cd]", "abe", 0));
+
+ // Range.
+ EXPECT_EQ(0, fnmatch("a[0-9]b", "a0b", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("a[0-9]b", "aOb", 0));
+
+ // Inverted range.
+ EXPECT_EQ(0, fnmatch("a[^0-9]b", "aOb", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("a[^0-9]b", "a0b", 0));
+
+ // Named.
+ EXPECT_EQ(0, fnmatch("a[[:digit:]]b", "a0b", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("a[[:digit:]]b", "aOb", 0));
+
+ // Inverted named.
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("a[^[:digit:]]b", "a0b", 0));
+ EXPECT_EQ(0, fnmatch("a[^[:digit:]]b", "aOb", 0));
+}
+
+TEST(fnmatch, wild_any) {
+ EXPECT_EQ(0, fnmatch("ab*", "ab", 0));
+ EXPECT_EQ(0, fnmatch("ab*", "abc", 0));
+ EXPECT_EQ(0, fnmatch("ab*", "abcd", 0));
+ EXPECT_EQ(0, fnmatch("ab*", "ab/cd", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab*", "ab/cd", FNM_PATHNAME));
+}
+
+TEST(fnmatch, wild_one) {
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab?", "ab", 0));
+ EXPECT_EQ(0, fnmatch("ab?", "abc", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab?", "abcd", 0));
+ EXPECT_EQ(0, fnmatch("ab?d", "abcd", 0));
+ EXPECT_EQ(0, fnmatch("ab?cd", "ab/cd", 0));
+ EXPECT_EQ(FNM_NOMATCH, fnmatch("ab?cd", "ab/cd", FNM_PATHNAME));
+}