summaryrefslogtreecommitdiff
path: root/libc/pwd_grp/pwent.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-06-12 23:27:00 +0000
committerEric Andersen <andersen@codepoet.org>2002-06-12 23:27:00 +0000
commitc617db9065afa51100199d9ac4561feee4279291 (patch)
treee4a90725f73b9fb7ec9970ca495172181acfa873 /libc/pwd_grp/pwent.c
parentfd6b9378be20243eaea7da1c2ddb3d68f123d28e (diff)
Silence warnings, clean things up.
-Erik
Diffstat (limited to 'libc/pwd_grp/pwent.c')
-rw-r--r--libc/pwd_grp/pwent.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/libc/pwd_grp/pwent.c b/libc/pwd_grp/pwent.c
index 804bd8957..55fd249bc 100644
--- a/libc/pwd_grp/pwent.c
+++ b/libc/pwd_grp/pwent.c
@@ -21,7 +21,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
-#include <pwd.h>
#include <fcntl.h>
#include <paths.h>
#include "config.h"
@@ -32,26 +31,22 @@
* link them all in together.
*/
-#define PWD_BUFFER_SIZE 256
-
/* file descriptor for the password file currently open */
static int pw_fd = -1;
-static char line_buff[PWD_BUFFER_SIZE];
-static struct passwd pwd;
void setpwent(void)
{
- if (pw_fd != -1)
- close(pw_fd);
+ if (pw_fd != -1)
+ close(pw_fd);
- pw_fd = open(_PATH_PASSWD, O_RDONLY);
+ pw_fd = open(_PATH_PASSWD, O_RDONLY);
}
void endpwent(void)
{
- if (pw_fd != -1)
- close(pw_fd);
- pw_fd = -1;
+ if (pw_fd != -1)
+ close(pw_fd);
+ pw_fd = -1;
}
int getpwent_r (struct passwd *password, char *buff,
@@ -65,7 +60,9 @@ int getpwent_r (struct passwd *password, char *buff,
struct passwd *getpwent(void)
{
- if (getpwent_r(&pwd, line_buff, PWD_BUFFER_SIZE, NULL) != -1) {
+ static char line_buff[PWD_BUFFER_SIZE];
+ static struct passwd pwd;
+ if (getpwent_r(&pwd, line_buff, sizeof(line_buff), NULL) != -1) {
return &pwd;
}
return NULL;