From 2e55dec21f3310e6868689fc1f4c4074ea3a35bb Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 27 Jun 2003 10:19:29 +0000
Subject: Fixup errno handling  -Erik

---
 libc/pwd_grp/fgetspent.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libc/pwd_grp/fgetspent.c')

diff --git a/libc/pwd_grp/fgetspent.c b/libc/pwd_grp/fgetspent.c
index 20698da1b..79594ecea 100644
--- a/libc/pwd_grp/fgetspent.c
+++ b/libc/pwd_grp/fgetspent.c
@@ -36,22 +36,23 @@ int fgetspent_r (FILE *file, struct spwd *spwd,
 	char *buff, size_t buflen, struct spwd **crap)
 {
     if (file == NULL) {
-	__set_errno(EINTR);
-	return -1;
+	return EINTR;
     }
     return(__getspent_r(spwd, buff, buflen, fileno(file)));
 }
 
 struct spwd *fgetspent(FILE * file)
 {
+    int ret;
     static char line_buff[PWD_BUFFER_SIZE];
     static struct spwd spwd;
 
     LOCK;
-    if (fgetspent_r(file, &spwd, line_buff, sizeof(line_buff), NULL) != -1) {
+    if ((ret=fgetspent_r(file, &spwd, line_buff, sizeof(line_buff), NULL)) == 0) {
 	UNLOCK;
 	return &spwd;
     }
     UNLOCK;
+    __set_errno(ret);
     return NULL;
 }
-- 
cgit v1.2.3