X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fpasswd%2Fgetpwent.c;h=f2bd516e57ba3261ab94c6081f692f77aaea4f47;hb=b76f37fd5625d038141b52184956fb4b7838e9a5;hp=e8501461a794c90eb39610ab5c3b34727e79fd3a;hpb=aef84ca7ec87ed21c2a2d5eecf3b4bbd6cbe3db9;p=musl

diff --git a/src/passwd/getpwent.c b/src/passwd/getpwent.c
index e8501461..f2bd516e 100644
--- a/src/passwd/getpwent.c
+++ b/src/passwd/getpwent.c
@@ -1,6 +1,9 @@
 #include "pwf.h"
 
 static FILE *f;
+static char *line;
+static struct passwd pw;
+static size_t size;
 
 void setpwent()
 {
@@ -12,34 +15,23 @@ weak_alias(setpwent, endpwent);
 
 struct passwd *getpwent()
 {
-	static char *line;
-	static struct passwd pw;
-	size_t size=0;
-	if (!f) f = fopen("/etc/passwd", "rb");
+	struct passwd *res;
+	if (!f) f = fopen("/etc/passwd", "rbe");
 	if (!f) return 0;
-	return __getpwent_a(f, &pw, &line, &size);
+	__getpwent_a(f, &pw, &line, &size, &res);
+	return res;
 }
 
 struct passwd *getpwuid(uid_t uid)
 {
-	struct passwd *pw;
-	int errno_saved;
-	setpwent();
-	while ((pw=getpwent()) && pw->pw_uid != uid);
-	errno_saved = errno;
-	endpwent();
-	errno = errno_saved;
-	return pw;
+	struct passwd *res;
+	__getpw_a(0, uid, &pw, &line, &size, &res);
+	return res;
 }
 
 struct passwd *getpwnam(const char *name)
 {
-	struct passwd *pw;
-	int errno_saved;
-	setpwent();
-	while ((pw=getpwent()) && strcmp(pw->pw_name, name));
-	errno_saved = errno;
-	endpwent();
-	errno = errno_saved;
-	return pw;
+	struct passwd *res;
+	__getpw_a(name, 0, &pw, &line, &size, &res);
+	return res;
 }