Add a bionic_alphasort function on bionic

alphasort doesn't have the right signature on bionic which causes the build to fail. This implements a new bionic_alphasort function when building on bionic providing the right signature and a functional equivalent of glibc's alphasort. This signature problem with alphasort was fixed in upstream bionic but hasn't been released yet. This commit can therefore be reverted as soon as the following commit hits the Android NDK: 40e467ec668b59be25491bd44bf348a884d6a68d Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Add a bionic_alphasort function on bionic
da9dd0f1 · Stéphane Graber · ffbf5815 · da9dd0f1
Commit da9dd0f1 authored Jan 03, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

parse.c src/lxc/parse.c +15 -0

No files found.
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -39,6 +39,17 @@
 #endif
 #endif
+/* Workaround for the broken signature of alphasort() in bionic.
+   This was fixed upstream in 40e467ec668b59be25491bd44bf348a884d6a68d so the
+   workaround can probably be dropped with the next version of the Android NDK.
+ */
+#ifdef IS_BIONIC
+int bionic_alphasort(const struct dirent** a, const struct dirent** b) {
+       return strcoll((*a)->d_name, (*b)->d_name);
+}
+#endif
 lxc_log_define(lxc_parse, lxc);
 static int dir_filter(const struct dirent *dirent)
@@ -55,7 +66,11 @@ int lxc_dir_for_each(const char *name, const char *directory,
 	struct dirent **namelist;
 	int n, ret = 0;
+#ifdef IS_BIONIC
+	n = scandir(directory, &namelist, dir_filter, bionic_alphasort);
+#else
 	n = scandir(directory, &namelist, dir_filter, alphasort);
+#endif
 	if (n < 0) {
 		SYSERROR("failed to scan %s directory", directory);
 		return -1;