public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] pwd: Implement fgetpwent_r using __nss_fgetent_r
@ 2020-07-21 6:26 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2020-07-21 6:26 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ee1c062be09da006e82ab34c1c9b5c82dd2af92c
commit ee1c062be09da006e82ab34c1c9b5c82dd2af92c
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Jul 16 17:34:19 2020 +0200
pwd: Implement fgetpwent_r using __nss_fgetent_r
Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
pwd/fgetpwent_r.c | 43 ++++++-------------------------------------
1 file changed, 6 insertions(+), 37 deletions(-)
diff --git a/pwd/fgetpwent_r.c b/pwd/fgetpwent_r.c
index 26b0ee52aa..0a2e4a55e2 100644
--- a/pwd/fgetpwent_r.c
+++ b/pwd/fgetpwent_r.c
@@ -20,9 +20,6 @@
#include <stdio.h>
#include <pwd.h>
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
/* Define a line parsing function using the common code
used in the nss_files module. */
@@ -72,39 +69,11 @@ int
__fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,
size_t buflen, struct passwd **result)
{
- char *p;
-
- flockfile (stream);
- do
- {
- buffer[buflen - 1] = '\xff';
- p = fgets_unlocked (buffer, buflen, stream);
- if (p == NULL && feof_unlocked (stream))
- {
- funlockfile (stream);
- *result = NULL;
- __set_errno (ENOENT);
- return errno;
- }
- if (p == NULL || buffer[buflen - 1] != '\xff')
- {
- funlockfile (stream);
- *result = NULL;
- __set_errno (ERANGE);
- return errno;
- }
-
- /* Skip leading blanks. */
- while (isspace (*p))
- ++p;
- } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
- /* Parse the line. If it is invalid, loop to
- get the next line of the file to parse. */
- || ! parse_line (p, resbuf, (void *) buffer, buflen, &errno));
-
- funlockfile (stream);
-
- *result = resbuf;
- return 0;
+ int ret = __nss_fgetent_r (stream, resbuf, buffer, buflen, parse_line);
+ if (ret == 0)
+ *result = resbuf;
+ else
+ *result = NULL;
+ return ret;
}
weak_alias (__fgetpwent_r, fgetpwent_r)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-07-21 6:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-21 6:26 [glibc] pwd: Implement fgetpwent_r using __nss_fgetent_r Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).