From 56104838733c81ba410ac41f767ac72267049489 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 10 Oct 2003 07:34:27 +0000 Subject: Implement getgrgid_r and getgrnam_r. Rework group handling code to be fully reentrant, since there was still a shared static value. indent stuff, --- libc/pwd_grp/pwent.c | 60 +++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) (limited to 'libc/pwd_grp/pwent.c') diff --git a/libc/pwd_grp/pwent.c b/libc/pwd_grp/pwent.c index b8ae812cb..e3488f4f5 100644 --- a/libc/pwd_grp/pwent.c +++ b/libc/pwd_grp/pwent.c @@ -1,6 +1,8 @@ +/* vi: set sw=4 ts=4: */ /* * pwent.c - This file is part of the libc-8086/pwd package for ELKS, * Copyright (C) 1995, 1996 Nat Friedman . + * Copyright (C) 2001-2003 Erik Andersen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -47,50 +49,50 @@ static int pw_fd = -1; void setpwent(void) { - LOCK; - if (pw_fd != -1) - close(pw_fd); + LOCK; + if (pw_fd != -1) + close(pw_fd); - pw_fd = open(_PATH_PASSWD, O_RDONLY); - UNLOCK; + pw_fd = open(_PATH_PASSWD, O_RDONLY); + UNLOCK; } void endpwent(void) { - LOCK; - if (pw_fd != -1) - close(pw_fd); - pw_fd = -1; - UNLOCK; + LOCK; + if (pw_fd != -1) + close(pw_fd); + pw_fd = -1; + UNLOCK; } int getpwent_r (struct passwd *password, char *buff, size_t buflen, struct passwd **result) { - int ret=EINVAL; - LOCK; - *result = NULL; - if (pw_fd != -1 && (ret=__getpwent_r(password, buff, buflen, pw_fd)) == 0) { + int ret=EINVAL; + LOCK; + *result = NULL; + if (pw_fd != -1 && (ret=__getpwent_r(password, buff, buflen, pw_fd)) == 0) { + UNLOCK; + *result = password; + return 0; + } UNLOCK; - *result = password; - return 0; - } - UNLOCK; - __set_errno(ret); - return ret; + __set_errno(ret); + return ret; } struct passwd *getpwent(void) { - int ret; - static char line_buff[PWD_BUFFER_SIZE]; - static struct passwd pwd; - struct passwd *result; + int ret; + static char line_buff[PWD_BUFFER_SIZE]; + static struct passwd pwd; + struct passwd *result; - if ((ret=getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) == 0) { - return &pwd; - } - __set_errno(ret); - return NULL; + if ((ret=getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) == 0) { + return &pwd; + } + __set_errno(ret); + return NULL; } -- cgit v1.2.3