aboutsummaryrefslogtreecommitdiff
path: root/pwd
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-07-16 17:34:19 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-07-21 07:34:34 +0200
commitee1c062be09da006e82ab34c1c9b5c82dd2af92c (patch)
tree64f553388d9b87598b1da4c6aa582e0925822929 /pwd
parent2add4235ef674988948155f9a8f60a8c7b09bcff (diff)
downloadglibc-ee1c062be09da006e82ab34c1c9b5c82dd2af92c.zip
glibc-ee1c062be09da006e82ab34c1c9b5c82dd2af92c.tar.gz
glibc-ee1c062be09da006e82ab34c1c9b5c82dd2af92c.tar.bz2
pwd: Implement fgetpwent_r using __nss_fgetent_r
Tested-by: Carlos O'Donell <carlos@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'pwd')
-rw-r--r--pwd/fgetpwent_r.c43
1 files changed, 6 insertions, 37 deletions
diff --git a/pwd/fgetpwent_r.c b/pwd/fgetpwent_r.c
index 26b0ee5..0a2e4a5 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)