summaryrefslogtreecommitdiff
path: root/libgcompat/grp.c
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2018-02-01 22:05:36 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2018-02-01 22:05:36 +0000
commit88815225fdabe7fa862f1c07abfcc971fdf5b04e (patch)
tree7aaae7c04fcf06aea85505fc028f476a131b9c50 /libgcompat/grp.c
parentc545f7393f0a10c182c2c085a36d7099b9c07a7f (diff)
parent78722ef403ffadcb78917e93e1859d43b9bf9df5 (diff)
downloadgcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.tar.gz
gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.tar.bz2
gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.tar.xz
gcompat-88815225fdabe7fa862f1c07abfcc971fdf5b04e.zip
Merge branch 'patch-1' into 'master'
Clean up everything and add lots of new functions I hope everything here is okay. I fixed some bugs in existing functions (mostly wrong prototypes or off-by-one errors) and formatted everything to a consistent style. If you'd like me to adjust the style, that's no problem. It wasn't very consistent to start with (within the code, and compared to the documentation). *I added specific notes you may want to comment on to some of the commit messages.* Major features: * Pass correct `argv[0]` in loader * Intercept `readlink("/proc/self/exe")` to allow re-exec * Add almost all reasonable-to-implement functions in LSB 5.0.0 core generic libc. Remaining functions are: - Impossible-to-implement: sigreturn - Not useful: reentrant random (`*rand48_r`, etc.), argz, envz, pmap, rpc (clnt_*, svc*, xdr*), bindresvport - Got tired of it: checked wchar * Add additional functions used by android and its NDK tools (clang, cmake, lldb, ninja, etc.). At this point, I am able to run Android Studio with the bundled prebuilt JDK, and compile, install, and run an android application (including one with native libraries) on a real device, with only a few minor issues: * must export `LD_LIBRARY_PATH=/opt/android-studio/jre/jre/lib/amd64/server` because musl and glibc interpret the variable differently with regards to `dlopen`. This is something that has to be patched in musl builds of openjdk, so it's not a gcompat issue. * ld.bfd fails to parse the argument `--sysroot=/path`, but can parse `--sysroot /path`. So there's some difference with `getopt_long_only` (or getopt in general). May be a bug, may be just an API difference. May be it can be patched up. * LLDB fails to connect to the android phone for native debugging -- I haven't tried it on glibc yet, so it may not be a gcompat issue at all (may be a phone or the app issue). I'd be happy to send some documentation later. See merge request !1
Diffstat (limited to 'libgcompat/grp.c')
-rw-r--r--libgcompat/grp.c98
1 files changed, 98 insertions, 0 deletions
diff --git a/libgcompat/grp.c b/libgcompat/grp.c
new file mode 100644
index 0000000..5674fda
--- /dev/null
+++ b/libgcompat/grp.c
@@ -0,0 +1,98 @@
+/* some musl versions incorrectly mark fgetgrent() as a GNU extension */
+#define _GNU_SOURCE
+#include <assert.h> /* assert */
+#include <errno.h> /* ENOENT, ERANGE */
+#include <grp.h> /* fgetgrent, getgrent, struct group */
+#include <pthread.h> /* pthread_mutex_* */
+#include <stddef.h> /* NULL, size_t */
+#include <stdint.h> /* ptrdiff_t, uintptr_t */
+#include <stdio.h> /* FILE */
+#include <string.h> /* memcpy, stpcpy, strlcpy, strlen */
+
+#define ALIGN_PTR_TO_SIZE_OF(ptr, type) \
+ ((type *) ((((uintptr_t)(ptr)) + sizeof(type) - 1) \
+ & ~(sizeof(type) - 1)))
+
+static pthread_mutex_t grent_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static int __fgetgrent_r(FILE *stream, struct group *grp, char *buf, size_t len,
+ struct group **result)
+{
+ struct group *grtmp;
+ char *cursor = buf, *end = buf + len;
+
+ *result = NULL;
+ pthread_mutex_lock(&grent_mutex);
+ grtmp = stream != NULL ? fgetgrent(stream) : getgrent();
+ if (grtmp == NULL) {
+ pthread_mutex_unlock(&grent_mutex);
+ return ENOENT;
+ }
+ memcpy(grp, grtmp, sizeof(*grp));
+ if (grtmp->gr_name != NULL) {
+ grp->gr_name = cursor;
+ cursor += strlcpy(cursor, grtmp->gr_name, end - cursor) + 1;
+ if (cursor > end) {
+ goto err_unlock;
+ }
+ }
+ if (grtmp->gr_passwd != NULL) {
+ grp->gr_passwd = cursor;
+ cursor += strlcpy(cursor, grtmp->gr_passwd, end - cursor) + 1;
+ if (cursor > end) {
+ goto err_unlock;
+ }
+ }
+ if (grtmp->gr_mem != NULL) {
+ char **members = ALIGN_PTR_TO_SIZE_OF(cursor, char *);
+ ptrdiff_t nameslen = 0;
+ size_t nmem = 0;
+
+ /* Calculate total size of strings plus their pointers. */
+ while (grtmp->gr_mem[nmem++] != NULL) {
+ nameslen += strlen(grtmp->gr_mem[nmem - 1]) + 1;
+ }
+ nameslen += nmem * sizeof(*members);
+ if (nameslen > end - ((char *) members)) {
+ goto err_unlock;
+ }
+ /* Copy the pointers, including the NULL sentinel. */
+ for (size_t i = 0; i < nmem; ++i) {
+ members[i] = grtmp->gr_mem[i];
+ }
+ /* Copy the strings (the NULL sentinel doesn't point to one). */
+ cursor = (char *) &members[nmem];
+ for (size_t i = 0; i < nmem - 1; ++i) {
+ cursor = stpcpy(cursor, members[i]) + 1;
+ }
+ }
+ pthread_mutex_unlock(&grent_mutex);
+ *result = grp;
+
+ return 0;
+
+err_unlock:
+ pthread_mutex_unlock(&grent_mutex);
+ return ERANGE;
+}
+
+/**
+ * Get group file entry.
+ */
+int fgetgrent_r(FILE *stream, struct group *grp, char *buf, size_t len,
+ struct group **result)
+{
+ assert(stream != NULL);
+
+ return __fgetgrent_r(stream, grp, buf, len, result);
+}
+
+/**
+ * Get group database entry.
+ *
+ * LSB 5.0: LSB-Core-generic/baselib-getgrent-r-1.html
+ */
+int getgrent_r(struct group *grp, char *buf, size_t len, struct group **result)
+{
+ return __fgetgrent_r(NULL, grp, buf, len, result);
+}