Merge "Add test_forked() option"
diff --git a/libc/bionic/flockfile.cpp b/libc/bionic/flockfile.cpp
index 3381e8e..b73907cb 100644
--- a/libc/bionic/flockfile.cpp
+++ b/libc/bionic/flockfile.cpp
@@ -36,12 +36,20 @@
// struct __sfileext (see fileext.h).
void flockfile(FILE* fp) {
+ if (!__sdidinit) {
+ __sinit();
+ }
+
if (fp != NULL) {
pthread_mutex_lock(&_FLOCK(fp));
}
}
int ftrylockfile(FILE* fp) {
+ if (!__sdidinit) {
+ __sinit();
+ }
+
// The specification for ftrylockfile() says it returns 0 on success,
// or non-zero on error. So return an errno code directly on error.
if (fp == NULL) {
@@ -52,6 +60,10 @@
}
void funlockfile(FILE* fp) {
+ if (!__sdidinit) {
+ __sinit();
+ }
+
if (fp != NULL) {
pthread_mutex_unlock(&_FLOCK(fp));
}
diff --git a/libc/stdio/fileext.h b/libc/stdio/fileext.h
index dc89fff..25b7bda 100644
--- a/libc/stdio/fileext.h
+++ b/libc/stdio/fileext.h
@@ -34,6 +34,8 @@
#include <pthread.h>
+__BEGIN_DECLS
+
/*
* file extension
*/
@@ -61,4 +63,6 @@
_FILEEXT_INIT(f); \
} while (0)
+__END_DECLS
+
#endif /* _FILEEXT_H_ */
diff --git a/libc/stdio/glue.h b/libc/stdio/glue.h
index 4ead20a..a9e5d10 100644
--- a/libc/stdio/glue.h
+++ b/libc/stdio/glue.h
@@ -32,6 +32,10 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
/*
* The first few FILEs are statically allocated; others are dynamically
* allocated and linked in via this glue structure.
@@ -44,3 +48,5 @@
/* This was referenced by a couple of different pieces of middleware and the Crystax NDK. */
__LIBC64_HIDDEN__ extern struct glue __sglue;
+
+__END_DECLS
diff --git a/libc/stdio/local.h b/libc/stdio/local.h
index 13188ee..46b11f1 100644
--- a/libc/stdio/local.h
+++ b/libc/stdio/local.h
@@ -41,6 +41,8 @@
#include "wcio.h"
#include "fileext.h"
+__BEGIN_DECLS
+
/*
* Android <= KitKat had getc/putc macros in <stdio.h> that referred
* to __srget/__swbuf, so those symbols need to be public for LP32
@@ -137,3 +139,5 @@
wint_t __fputwc_unlock(wchar_t wc, FILE *fp);
#pragma GCC visibility pop
+
+__END_DECLS
diff --git a/libc/stdio/wcio.h b/libc/stdio/wcio.h
index 584a3f2..2c1fa3c 100644
--- a/libc/stdio/wcio.h
+++ b/libc/stdio/wcio.h
@@ -32,6 +32,10 @@
#ifndef _WCIO_H_
#define _WCIO_H_
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
/* minimal requirement of SUSv2 */
#define WCIO_UNGETWC_BUFSIZE 1
@@ -78,4 +82,6 @@
#define WCIO_INIT(fp) \
memset(&(_EXT(fp)->_wcio), 0, sizeof(struct wchar_io_data))
+__END_DECLS
+
#endif /*_WCIO_H_*/
diff --git a/tests/ftw_test.cpp b/tests/ftw_test.cpp
index 7ffbfe0..38b3d49 100644
--- a/tests/ftw_test.cpp
+++ b/tests/ftw_test.cpp
@@ -14,27 +14,36 @@
* limitations under the License.
*/
-#include <gtest/gtest.h>
-#include "TemporaryFile.h"
-
#include <ftw.h>
+
#include <stdlib.h>
#include <sys/stat.h>
+#include <gtest/gtest.h>
+
void sanity_check_ftw(const char* fpath, const struct stat* sb, int tflag) {
ASSERT_TRUE(fpath != NULL);
ASSERT_TRUE(sb != NULL);
- bool is_dir = S_ISDIR(sb->st_mode);
- ASSERT_TRUE((is_dir && tflag == FTW_D) || (!is_dir && tflag == FTW_F));
+ if (S_ISDIR(sb->st_mode)) {
+ ASSERT_TRUE(tflag == FTW_D || tflag == FTW_DNR || tflag == FTW_DP) << fpath;
+ } else if (S_ISLNK(sb->st_mode)) {
+ ASSERT_EQ(FTW_SL, tflag) << fpath;
+ } else {
+ ASSERT_EQ(FTW_F, tflag) << fpath;
+ }
}
-void sanity_check_nftw(
- const char* fpath, const struct stat* sb, int tflag, struct FTW* ftwbuf) {
+void sanity_check_nftw(const char* fpath, const struct stat* sb, int tflag, struct FTW* ftwbuf) {
sanity_check_ftw(fpath, sb, tflag);
- // either the parent dir or the file
- bool is_dir = S_ISDIR(sb->st_mode);
- ASSERT_TRUE(
- (is_dir && ftwbuf->level == 0) || (!is_dir && ftwbuf->level == 1));
+
+ size_t slash_count = 0;
+ const char* p = fpath;
+ while ((p = strchr(p + 1, '/')) != NULL) {
+ ++slash_count;
+ }
+
+ ASSERT_EQ('/', fpath[ftwbuf->base - 1]) << fpath;
+ ASSERT_EQ(slash_count, static_cast<size_t>(ftwbuf->level)) << fpath;
}
int check_ftw(const char* fpath, const struct stat* sb, int tflag) {
@@ -47,39 +56,28 @@
return 0;
}
-int check_nftw(
- const char* fpath, const struct stat* sb, int tflag, struct FTW* ftwbuf) {
+int check_nftw(const char* fpath, const struct stat* sb, int tflag, struct FTW* ftwbuf) {
sanity_check_nftw(fpath, sb, tflag, ftwbuf);
return 0;
}
-int check_nftw64(
- const char* fpath, const struct stat64* sb, int tflag, struct FTW* ftwbuf) {
- sanity_check_nftw(fpath, reinterpret_cast<const struct stat*>(sb),
- tflag, ftwbuf);
+int check_nftw64(const char* fpath, const struct stat64* sb, int tflag, struct FTW* ftwbuf) {
+ sanity_check_nftw(fpath, reinterpret_cast<const struct stat*>(sb), tflag, ftwbuf);
return 0;
}
TEST(ftw, ftw) {
- TemporaryDir td;
- TemporaryFile tf(td.dirname);
- ftw(td.dirname, check_ftw, 1);
+ ASSERT_EQ(0, ftw("/sys", check_ftw, 128));
}
TEST(ftw, ftw64) {
- TemporaryDir td;
- TemporaryFile tf(td.dirname, mkstemp64);
- ftw64(td.dirname, check_ftw64, 1);
+ ASSERT_EQ(0, ftw64("/sys", check_ftw64, 128));
}
TEST(ftw, nftw) {
- TemporaryDir td;
- TemporaryFile tf(td.dirname);
- nftw(td.dirname, check_nftw, 1, 0);
+ ASSERT_EQ(0, nftw("/sys", check_nftw, 128, 0));
}
TEST(ftw, nftw64) {
- TemporaryDir td;
- TemporaryFile tf(td.dirname, mkstemp64);
- nftw64(td.dirname, check_nftw64, 1, 0);
+ ASSERT_EQ(0, nftw64("/sys", check_nftw64, 128, 0));
}