X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fpasswd%2Fgetpwent_a.c;h=d1b4b53ce2008234ea37a4e5cfe5e78f5456142f;hb=83b858f83b658bd34eca5d8ad4d145f673ae7e5e;hp=aaf84edde708416302b51eb376f0876ea9382a44;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/passwd/getpwent_a.c b/src/passwd/getpwent_a.c
index aaf84edd..d1b4b53c 100644
--- a/src/passwd/getpwent_a.c
+++ b/src/passwd/getpwent_a.c
@@ -1,14 +1,27 @@
 #include "pwf.h"
+#include <pthread.h>
 
-struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size)
+static unsigned atou(char **s)
+{
+	unsigned x;
+	for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0');
+	return x;
+}
+
+int __getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size, struct passwd **res)
 {
 	ssize_t l;
 	char *s;
+	int rv = 0;
+	int cs;
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
 	for (;;) {
 		if ((l=getline(line, size, f)) < 0) {
+			rv = ferror(f) ? errno : 0;
 			free(*line);
 			*line = 0;
-			return 0;
+			pw = 0;
+			break;
 		}
 		line[0][l-1] = 0;
 
@@ -19,11 +32,11 @@ struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *siz
 		*s++ = 0; pw->pw_passwd = s;
 		if (!(s = strchr(s, ':'))) continue;
 
-		*s++ = 0; pw->pw_uid = atoi(s);
-		if (!(s = strchr(s, ':'))) continue;
+		*s++ = 0; pw->pw_uid = atou(&s);
+		if (*s != ':') continue;
 
-		*s++ = 0; pw->pw_gid = atoi(s);
-		if (!(s = strchr(s, ':'))) continue;
+		*s++ = 0; pw->pw_gid = atou(&s);
+		if (*s != ':') continue;
 
 		*s++ = 0; pw->pw_gecos = s;
 		if (!(s = strchr(s, ':'))) continue;
@@ -32,6 +45,10 @@ struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *siz
 		if (!(s = strchr(s, ':'))) continue;
 
 		*s++ = 0; pw->pw_shell = s;
-		return pw;
+		break;
 	}
+	pthread_setcancelstate(cs, 0);
+	*res = pw;
+	if (rv) errno = rv;
+	return rv;
 }