From e1c6ee839d13d57a4756e506a6b03f6a82b86d61 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 9 Jun 1999 12:01:54 +0000 Subject: Update. 1999-06-09 Ulrich Drepper * pwd/fgetpwent_r.c: Set errno in the correct way. * shadow/fgetspent_r.c: Likewise. * pwd/fgetpwent.c: Handle long lines correctly. Little optimizations. Free static buffer when debugging memory handling. * shadow/fgetspent.c: Likewise. * grp/fgetgrent.c: Little optimization in loop. 1999-06-09 Andreas Jaeger * grp/tst_fgetgrent.c (write_group): Fix generation of long line in a different way. --- pwd/fgetpwent.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'pwd/fgetpwent.c') diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index 0b5a169..09a13c3 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,22 +19,28 @@ #include #include #include +#include #include /* We need to protect the dynamic buffer handling. */ __libc_lock_define_initialized (static, lock); +static char *buffer; + /* Read one entry from the given stream. */ struct passwd * fgetpwent (FILE *stream) { - static char *buffer; static size_t buffer_size; static struct passwd resbuf; + fpos_t pos; struct passwd *result; int save; + if (fgetpos (stream, &pos) != 0) + return NULL; + /* Get lock. */ __libc_lock_lock (lock); @@ -46,8 +52,8 @@ fgetpwent (FILE *stream) } while (buffer != NULL - && __fgetpwent_r (stream, &resbuf, buffer, buffer_size, &result) != 0 - && errno == ERANGE) + && (__fgetpwent_r (stream, &resbuf, buffer, buffer_size, &result) + == ERANGE)) { char *new_buf; buffer_size += NSS_BUFLEN_PASSWD; @@ -61,6 +67,10 @@ fgetpwent (FILE *stream) __set_errno (save); } buffer = new_buf; + + /* Reset the stream. */ + if (fsetpos (stream, &pos) != 0) + buffer = NULL; } if (buffer == NULL) @@ -73,3 +83,14 @@ fgetpwent (FILE *stream) return result; } + + +/* Free all resources if necessary. */ +static void __attribute__ ((unused)) +free_mem (void) +{ + if (buffer != NULL) + free (buffer); +} + +text_set_element (__libc_subfreeres, free_mem); -- cgit v1.1