Skip to content

enable fd_readdir for android target #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjihrig merged 1 commit into from
Oct 5, 2025
Merged

enable fd_readdir for android target #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/uvwasi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#define UVWASI__READDIR_NUM_ENTRIES 1

#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
# define UVWASI_FD_READDIR_SUPPORTED 1
#endif

Expand Down
4 changes: 2 additions & 2 deletions test/test-ebadf-input-validation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ int main(void) {
CHECK(uvwasi_fd_prestat_dir_name(&uvw, 100, test_str, 10));
CHECK(uvwasi_fd_pwrite(&uvw, 100, &test_ciovec, 2, 10, &test_size));
CHECK(uvwasi_fd_read(&uvw, 100, &test_iovec, 2, &test_size));
#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
CHECK(uvwasi_fd_readdir(&uvw, 100, test_void, 3, test_dircookie, &test_size));
#else
assert(UVWASI_ENOSYS ==
uvwasi_fd_readdir(&uvw, 100, test_void, 3, test_dircookie, &test_size));
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */
CHECK(uvwasi_fd_renumber(&uvw, 100, 2));
CHECK(uvwasi_fd_seek(&uvw, 100, 10, UVWASI_WHENCE_CUR, &test_filesize));
CHECK(uvwasi_fd_sync(&uvw, 100));
Expand Down
4 changes: 2 additions & 2 deletions test/test-fd-advise-dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#define TEST_PATH_ADVISE TEST_TMP_DIR "/test_fd_advise_dir"

int main(void) {
#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
uvwasi_t uvwasi;
uvwasi_options_t init_options;
uv_fs_t req;
Expand Down Expand Up @@ -40,6 +40,6 @@ int main(void) {

uvwasi_destroy(&uvwasi);
free(init_options.preopens);
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */
return 0;
}
8 changes: 4 additions & 4 deletions test/test-fd-readdir-cookie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define TEST_TMP_DIR "./out/tmp"
#define TEST_PATH_READDIR TEST_TMP_DIR "/test_readdir_cookie"

#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
static void touch_file(const char *name) {
uv_fs_t req;
int r;
Expand All @@ -23,14 +23,14 @@ static void touch_file(const char *name) {
uv_fs_req_cleanup(&req);
assert(r == 0);
}
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */

/*
* This is a test case for https://github.com/nodejs/node/issues/47193.
*/

int main(void) {
#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
uvwasi_t uvwasi;
uvwasi_options_t init_options;
uvwasi_dircookie_t cookie;
Expand Down Expand Up @@ -96,6 +96,6 @@ int main(void) {
uvwasi_destroy(&uvwasi);
free(init_options.preopens);

#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */
return 0;
}
8 changes: 4 additions & 4 deletions test/test-fd-readdir-ls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define TEST_PATH_READDIR TEST_TMP_DIR "/test_readdir_ls"


#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
static void touch_file(const char* name) {
uv_fs_t req;
int r;
Expand All @@ -27,14 +27,14 @@ static void touch_file(const char* name) {
uv_fs_req_cleanup(&req);
assert(r == 0);
}
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */

/*
* This is a test case for https://github.com/nodejs/uvwasi/issues/174.
*/

int main(void) {
#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
uvwasi_t uvwasi;
uvwasi_options_t init_options;
uvwasi_dircookie_t cookie;
Expand Down Expand Up @@ -85,6 +85,6 @@ int main(void) {
uvwasi_destroy(&uvwasi);
free(init_options.preopens);

#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */
return 0;
}
8 changes: 4 additions & 4 deletions test/test-fd-readdir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define TEST_PATH_FILE_2 TEST_PATH_READDIR "/test_file_2"


#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
static void touch_file(const char* name) {
uv_fs_t req;
int r;
Expand All @@ -29,11 +29,11 @@ static void touch_file(const char* name) {
uv_fs_req_cleanup(&req);
assert(r == 0);
}
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */


int main(void) {
#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
uvwasi_t uvwasi;
uvwasi_options_t init_options;
uvwasi_dircookie_t cookie;
Expand Down Expand Up @@ -113,6 +113,6 @@ int main(void) {

uvwasi_destroy(&uvwasi);
free(init_options.preopens);
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */
return 0;
}
4 changes: 2 additions & 2 deletions test/test-fstflags-validate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define TEST_TMP_DIR "./out/tmp"

int main(void) {
#if !defined(_WIN32) && !defined(__ANDROID__)
#if !defined(_WIN32)
uvwasi_t uvwasi;
uvwasi_options_t init_options;
uvwasi_errno_t err;
Expand Down Expand Up @@ -42,6 +42,6 @@ int main(void) {

uvwasi_destroy(&uvwasi);
free(init_options.preopens);
#endif /* !defined(_WIN32) && !defined(__ANDROID__) */
#endif /* !defined(_WIN32) */
return 0;
}