Initial release

1 files changed, 122 insertions, 0 deletions

diff --git a/fix-readdir-on-glibc-2.24.patch b/fix-readdir-on-glibc-2.24.patch
new file mode 100644
index 000000000000..68a4a2b89951
--- /dev/null
+++ b/fix-readdir-on-glibc-2.24.patch
@@ -0,0 +1,122 @@
+diff --git a/src/Native/System.Native/pal_io.cpp b/src/Native/System.Native/pal_io.cpp
+index 7da1bff..f2001dc 100644
+--- a/src/Native/System.Native/pal_io.cpp
++++ b/src/Native/System.Native/pal_io.cpp
+@@ -321,11 +321,13 @@ extern "C" int32_t SystemNative_GetDirentSize()
+ //    size of the dirent struct.
+ // 2) The managed code creates a byte[] buffer of the size of the native dirent
+ //    and passes a pointer to this buffer to this function.
+-// 3) This function passes input byte[] buffer to the OS to fill with dirent data
+-//    which makes the 1st strcpy.
+-// 4) The ConvertDirent function will set a pointer to the start of the inode name
+-//    in the byte[] buffer so the managed code and find it and copy it out of the
+-//    buffer into a managed string that the caller of the framework can use, making
++// 3) This function passes input byte[] buffer to the OS to fill with dirent
++//    data which makes the 1st strcpy.
++// 4) The ConvertDirent function will fill DirectoryEntry outputEntry with
++//    pointers from byte[] buffer.
++// 5) The managed code uses DirectoryEntry outputEntry to find start of d_name
++//    and the value of d_namelen, if avalable, to copy the name from
++//    byte[] buffer into a managed string that the caller can use; this makes
+ //    the 2nd and final strcpy.
+ extern "C" int32_t SystemNative_ReadDirR(DIR* dir, void* buffer, int32_t bufferSize, DirectoryEntry* outputEntry)
+ {
+@@ -341,6 +343,7 @@ extern "C" int32_t SystemNative_ReadDirR(DIR* dir, void* buffer, int32_t bufferS
+ 
+     dirent* result = nullptr;
+     dirent* entry = static_cast<dirent*>(buffer);
++#ifdef HAVE_READDIR_R
+     int error = readdir_r(dir, entry, &result);
+ 
+     // positive error number returned -> failure
+@@ -360,6 +363,27 @@ extern "C" int32_t SystemNative_ReadDirR(DIR* dir, void* buffer, int32_t bufferS
+ 
+     // 0 returned with non-null result (guaranteed to be set to entry arg) -> success
+     assert(result == entry);
++#else
++    errno = 0;
++    result = readdir(dir);
++
++    // 0 returned with null result -> end-of-stream
++    if (result == nullptr)
++    {
++        *outputEntry = {}; // managed out param must be initialized
++
++        //  kernel set errno -> failure
++        if (errno != 0)
++        {
++            assert(errno == EBADF); // Invalid directory stream descriptor dir.
++            return errno;
++        }
++        return -1;
++    }
++
++    assert(result->d_reclen <= bufferSize);
++    memcpy(entry, result, static_cast<size_t>(result->d_reclen));
++#endif
+     ConvertDirent(*entry, outputEntry);
+     return 0;
+ }
+diff --git a/src/Native/configure.cmake b/src/Native/configure.cmake
+index 017d75f..663aff8 100644
+--- a/src/Native/configure.cmake
++++ b/src/Native/configure.cmake
+@@ -174,6 +174,20 @@ check_cxx_source_compiles(
+ 
+ check_cxx_source_compiles(
+     "
++    #include <dirent.h>
++    int main(void)
++    {
++        DIR* dir;
++        struct dirent* entry;
++        struct dirent* result;
++        readdir_r(dir, entry, &result);
++        return 0;
++    }
++    "
++    HAVE_READDIR_R)
++
++check_cxx_source_compiles(
++    "
+     #include <sys/types.h>
+     #include <sys/event.h>
+     int main(void)
+@@ -274,12 +288,12 @@ check_cxx_source_runs(
+     #include <sys/time.h>
+     int main()
+     {
+-        int ret; 
++        int ret;
+         struct timespec ts;
+         ret = clock_gettime(CLOCK_MONOTONIC, &ts);
+         exit(ret);
+     }
+-    " 
++    "
+     HAVE_CLOCK_MONOTONIC)
+ 
+ check_function_exists(
+@@ -399,9 +413,9 @@ check_function_exists(
+ 
+ set (HAVE_INOTIFY 0)
+ if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
+-	set (HAVE_INOTIFY 1)
++    set (HAVE_INOTIFY 1)
+ elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
+-	message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
++    message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
+ endif()
+ 
+ check_cxx_source_compiles(
+@@ -428,8 +442,8 @@ check_cxx_source_compiles(
+ check_cxx_source_compiles(
+     "
+     #include <curl/curl.h>
+-    int main() 
+-    { 
++    int main()
++    {
+         int i = CURL_SSLVERSION_TLSv1_0;
+         i = CURL_SSLVERSION_TLSv1_1;
+         i = CURL_SSLVERSION_TLSv1_2;