math: fix undefined shift in logf

[musl] / src / passwd / getgr_r.c

diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c
index 1dc5f7e..f3e8f60 100644 (file)
--- a/src/passwd/getgr_r.c
+++ b/src/passwd/getgr_r.c
@@ -5,7 +5,6 @@
 
 static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, size_t size, struct group **res)
 {
-       FILE *f;
        char *line = 0;
        size_t len = 0;
        char **mem = 0;
@@ -16,38 +15,26 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
 
        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
 
-       f = fopen("/etc/group", "rb");
-       if (!f) {
-               rv = errno;
-               goto done;
+       rv = __getgr_a(name, gid, gr, &line, &len, &mem, &nmem, res);
+       if (*res && size < len + (nmem+1)*sizeof(char *) + 32) {
+               *res = 0;
+               rv = ERANGE;
        }
-
-       *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) {
-                               rv = ERANGE;
-                               break;
-                       }
-                       *res = gr;
-                       buf += (16-(uintptr_t)buf)%16;
-                       gr->gr_mem = (void *)buf;
-                       buf += nmem*sizeof(char *);
-                       memcpy(buf, line, len);
-                       FIX(name);
-                       FIX(passwd);
-                       for (i=0; mem[i]; i++)
-                               gr->gr_mem[i] = mem[i]-line+buf;
-                       gr->gr_mem[i] = 0;
-                       break;
-               }
+       if (*res) {
+               buf += (16-(uintptr_t)buf)%16;
+               gr->gr_mem = (void *)buf;
+               buf += (nmem+1)*sizeof(char *);
+               memcpy(buf, line, len);
+               FIX(name);
+               FIX(passwd);
+               for (i=0; mem[i]; i++)
+                       gr->gr_mem[i] = mem[i]-line+buf;
+               gr->gr_mem[i] = 0;
        }
        free(mem);
        free(line);
-       fclose(f);
-done:
        pthread_setcancelstate(cs, 0);
+       if (rv) errno = rv;
        return rv;
 }