Cleanup getprop, add qstrcmp() to lib for qsort (because posix-2008 broke

alphasort), add compile-time probe for config symbol TOYBOX_ON_ANDROID.

2 files changed, 9 insertions, 0 deletions

diff --git a/lib/lib.c b/lib/lib.c
index 99d2ea60..1a60a7ff 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -887,3 +887,11 @@ int human_readable(char *buf, unsigned long long num)
 
   return end;
 }
+
+// The qsort man page says you can use alphasort, the posix committee
+// disagreed, and doubled down: http://austingroupbugs.net/view.php?id=142
+// So just do our own. (The const is entirely to humor the stupid compiler.)
+int qstrcmp(const void *a, const void *b)
+{
+  return strcmp(*(char **)a, *(char **)b);
+}
diff --git a/lib/lib.h b/lib/lib.h
index 3cda7d9f..a4e5808d 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -176,6 +176,7 @@ void base64_init(char *p);
 int terminal_size(unsigned *x, unsigned *y);
 int yesno(char *prompt, int def);
 int human_readable(char *buf, unsigned long long num);
+int qstrcmp(const void *a, const void *b);
 
 // net.c
 int xsocket(int domain, int type, int protocol);