X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fpasswd%2Fgetgr_r.c;h=f3e8f603a32832505538c60e1d210c2e529df9c5;hb=c221d3e5862e249b03aa7569d5fec6389294fb22;hp=33e35d3a23824171c2c6e00a2424882ba337fbd7;hpb=c19a6be5a18d51a157cf91bf3909f71fa277e588;p=musl

diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c
index 33e35d3a..f3e8f603 100644
--- a/src/passwd/getgr_r.c
+++ b/src/passwd/getgr_r.c
@@ -1,44 +1,40 @@
 #include "pwf.h"
+#include <pthread.h>
 
 #define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf)
 
 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;
 	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);
 
-	*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;
-		}
+	rv = __getgr_a(name, gid, gr, &line, &len, &mem, &nmem, res);
+	if (*res && size < len + (nmem+1)*sizeof(char *) + 32) {
+		*res = 0;
+		rv = ERANGE;
+	}
+	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);
+	pthread_setcancelstate(cs, 0);
+	if (rv) errno = rv;
 	return rv;
 }