X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fpasswd%2Fgetgr_r.c;h=1dc5f7e0e38df9398eaadbdb5e0291a546b599b8;hp=33e35d3a23824171c2c6e00a2424882ba337fbd7;hb=4948a24df21c1e80bedc1f302547c9cb26e4dbfe;hpb=147f355cb698fc90a07e48048275831de73d0fc4 diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c index 33e35d3a..1dc5f7e0 100644 --- a/src/passwd/getgr_r.c +++ b/src/passwd/getgr_r.c @@ -1,4 +1,5 @@ #include "pwf.h" +#include #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; + + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); f = fopen("/etc/group", "rb"); - if (!f) return errno; + 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; }