From 4948a24df21c1e80bedc1f302547c9cb26e4dbfe Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 1 Feb 2012 23:51:19 -0500 Subject: make passwd/group functions safe against cancellation in stdio these changes are a prerequisite to making stdio cancellable. --- src/passwd/getpw_r.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/passwd/getpw_r.c') 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; } -- cgit v1.2.1