X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fpasswd%2Fgetpw_r.c;h=39744959ad12401be77295e8f4ead9226a6152de;hp=7b331e8a39109bda2017ccea7ac44a702cb246cc;hb=4948a24df21c1e80bedc1f302547c9cb26e4dbfe;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 diff --git a/src/passwd/getpw_r.c b/src/passwd/getpw_r.c index 7b331e8a..39744959 100644 --- a/src/passwd/getpw_r.c +++ b/src/passwd/getpw_r.c @@ -1,4 +1,5 @@ #include "pwf.h" +#include #define FIX(x) (pw->pw_##x = pw->pw_##x-line+buf) @@ -8,9 +9,15 @@ static int getpw_r(const char *name, uid_t uid, struct passwd *pw, char *buf, si char *line = 0; size_t len = 0; int rv = 0; + int cs; + + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); f = fopen("/etc/passwd", "rb"); - if (!f) return errno; + if (!f) { + rv = errno; + goto done; + } *res = 0; while (__getpwent_a(f, pw, &line, &len)) { @@ -32,6 +39,8 @@ static int getpw_r(const char *name, uid_t uid, struct passwd *pw, char *buf, si } free(line); fclose(f); +done: + pthread_setcancelstate(cs, 0); return rv; }