Merge ~binli/libhybris/+git/libhybris-ubuntu:bug-1596772/add-scandir-hook into ~morphis/libhybris/+git/libhybris-ubuntu:master

[Bin Li]

Add hooks to support scandir, scandirat, alphasort, versionsort, scandir64
https://bugs.launchpad.net/libhybris/+bug/1596772

556b327... by Bin Li on 2016-06-28

Add hooks to support scandir, scandirat, alphasort, versionsort, scandir64
Bugs: https://bugs.launchpad.net/libhybris/+bug/1596772

[Bin Li (binli)]

In hooks[] there are opendir and closedir twice, so I removed one.

[Simon Fels (morphis)]

Comments in line.

review: Needs Fixing

Unmerged commits

556b327... by Bin Li on 2016-06-28

Add hooks to support scandir, scandirat, alphasort, versionsort, scandir64
Bugs: https://bugs.launchpad.net/libhybris/+bug/1596772

diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index a7c761f..2520611 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -1386,6 +1386,77 @@ static int my_readdir_r(DIR *dir, struct bionic_dirent *entry,
     return res;
 }
 
+static int _hybris_hook_alphasort(struct bionic_dirent **a,
+                        struct bionic_dirent **b)
+{
+    return strcoll((*a)->d_name, (*b)->d_name);
+}
+static int _hybris_hook_versionsort(struct bionic_dirent **a,
+                          struct bionic_dirent **b)
+{
+    return strverscmp((*a)->d_name, (*b)->d_name);
+}
+
+static struct bionic_dirent *_hybris_hook_scandirat(int fd, DIR *dirp,  struct bionic_dirent ***namelist,
+		int (*filter)(const struct bionic_dirent *),
+		int (*compar)(const struct bionic_dirent **, const struct bionic_dirent **))
+{
+    struct dirent **namelist_r;
+    static struct bionic_dirent **result;
+    struct bionic_dirent *filter_r;
+
+    int i = 0;
+    size_t nItems = 0;
+
+    TRACE_HOOK("dirp %p", dirp);
+
+    int res = scandirat(fd, dirp, &namelist_r, NULL, NULL);
+
+    if (res != 0 && namelist_r != NULL) {
+
+        result = malloc(res * sizeof(struct bionic_dirent));
+        if (!result)
+            return -1;
+
+        for (i = 0; i < res; i++) {
+            filter_r = malloc(sizeof(struct bionic_dirent));
+            if (!filter_r) {
+                while (i-- > 0)
+                        free(result[i]);
+                    free(result);
+                    return -1;
+            }
+            filter_r->d_ino = namelist_r[i]->d_ino;
+            filter_r->d_off = namelist_r[i]->d_off;
+            filter_r->d_reclen = namelist_r[i]->d_reclen;
+            filter_r->d_type = namelist_r[i]->d_type;
+
+            strcpy(filter_r->d_name, namelist_r[i]->d_name);
+            filter_r->d_name[sizeof(namelist_r[i]->d_name) - 1] = '\0';
+
+            if (filter != NULL && !(*filter)(filter_r)) {//apply filter
+                free(filter_r);
+                continue;
+            }
+
+            result[nItems++] = filter_r;
+        }
+        if (nItems && compar != NULL) // sort
+            qsort(result, nItems, sizeof(struct bionic_dirent *), compar);
+
+        *namelist = result;
+    }
+
+    return res;
+}
+
+static struct bionic_dirent *_hybris_hook_scandir(DIR *dirp,  struct bionic_dirent ***namelist,
+		int (*filter)(const struct bionic_dirent *),
+		int (*compar)(const struct bionic_dirent **, const struct bionic_dirent **))
+{
+    return _hybris_hook_scandirat(AT_FDCWD, dirp, namelist, filter, compar);
+}
+
 static inline void swap(void **a, void **b)
 {
     void *tmp = *a;
@@ -1634,9 +1705,6 @@ static struct _hook hooks[] = {
     {"__sprintf_chk", __sprintf_chk},
     {"__snprintf_chk", __snprintf_chk},
     {"strncasecmp",strncasecmp},
-    /* dirent.h */
-    {"opendir", opendir},
-    {"closedir", closedir},
     /* pthread.h */
     {"getauxval", getauxval},
     {"gettid", my_gettid},
@@ -1803,9 +1871,13 @@ static struct _hook hooks[] = {
     {"seekdir", seekdir},
     {"telldir", telldir},
     {"dirfd", dirfd},
+    {"scandir", _hybris_hook_scandir},
+    {"scandirat", _hybris_hook_scandirat},
+    {"alphasort,", _hybris_hook_alphasort},
+    {"versionsort,", _hybris_hook_versionsort},
+    {"scandir64", scandir},
     /* fcntl.h */
     {"open", my_open},
-    // TODO: scandir, scandirat, alphasort, versionsort
     {"__get_tls_hooks", __get_tls_hooks},
     {"sscanf", sscanf},
     {"scanf", scanf},