math.h: make __FLOAT_BITS and __DOUBLE_BITS C89

[musl] / src / passwd / getgr_r.c

diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c
index 33e35d3..3fe2e2b 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,22 +12,28 @@ 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)) {
                if (name && !strcmp(name, gr->gr_name)
                || !name && gr->gr_gid == gid) {
-                       if (size < len + nmem*sizeof(char *) + 32) {
+                       if (size < len + (nmem+1)*sizeof(char *) + 32) {
                                rv = ERANGE;
                                break;
                        }
                        *res = gr;
                        buf += (16-(uintptr_t)buf)%16;
                        gr->gr_mem = (void *)buf;
-                       buf += nmem*sizeof(char *);
+                       buf += (nmem+1)*sizeof(char *);
                        memcpy(buf, line, len);
                        FIX(name);
                        FIX(passwd);
@@ -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;
 }