From 017c8132edae466e2892faec7ef6b834dfecbd34 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 27 Jun 2003 10:43:43 +0000 Subject: Yet more cleanup for the reentrant pwd/grp functions so they should now actually be doing the right thing --- libc/pwd_grp/spent.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libc/pwd_grp/spent.c') diff --git a/libc/pwd_grp/spent.c b/libc/pwd_grp/spent.c index b281072f4..734854b24 100644 --- a/libc/pwd_grp/spent.c +++ b/libc/pwd_grp/spent.c @@ -62,12 +62,14 @@ void endspent(void) } int getspent_r (struct spwd *spwd, char *buff, - size_t buflen, struct spwd **crap) + size_t buflen, struct spwd **result) { int ret; LOCK; + *result = NULL; if (spwd_fd != -1 && (ret=__getspent_r(spwd, buff, buflen, spwd_fd)) == 0) { UNLOCK; + *result = spwd; return 0; } UNLOCK; @@ -79,9 +81,10 @@ struct spwd *getspent(void) int ret; static char line_buff[PWD_BUFFER_SIZE]; static struct spwd spwd; + struct spwd *result; LOCK; - if ((ret=getspent_r(&spwd, line_buff, sizeof(line_buff), NULL)) == 0) { + if ((ret=getspent_r(&spwd, line_buff, sizeof(line_buff), &result)) == 0) { UNLOCK; return &spwd; } -- cgit v1.2.3