fix usage of locks with vfork

[musl] / src / passwd / getgr_r.c

diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c
index 5b1333e..234c901 100644 (file)
--- a/src/passwd/getgr_r.c
+++ b/src/passwd/getgr_r.c
@@ -1,4 +1,5 @@
 #include "pwf.h"
+#include <pthread.h>
 
 #define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
 
@@ -11,9 +12,15 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
        size_t nmem = 0;
        int rv = 0;
        size_t i;
+       int cs;
 
-       f = fopen("/etc/group", "rb");
-       if (!f) return errno;
+       pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+       f = fopen("/etc/group", "rbe");
+       if (!f) {
+               rv = errno;
+               goto done;
+       }
 
        *res = 0;
        while (__getgrent_a(f, gr, &line, &len, &mem, &nmem)) {
@@ -39,6 +46,8 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
        free(mem);
        free(line);
        fclose(f);
+done:
+       pthread_setcancelstate(cs, 0);
        return rv;
 }
 
@@ -47,7 +56,7 @@ int getgrnam_r(const char *name, struct group *gr, char *buf, size_t size, struc
        return getgr_r(name, 0, gr, buf, size, res);
 }
 
-int getgruid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
+int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
 {
        return getgr_r(0, gid, gr, buf, size, res);
 }