1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00

nss_files: Consolidate file opening in __nss_files_fopen

Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
2020-07-16 16:12:46 +02:00
parent 469c03907b
commit 299210c1fa
8 changed files with 86 additions and 11 deletions

View File

@@ -26,6 +26,7 @@
#include <string.h>
#include "nsswitch.h"
#include "netgroup.h"
#include <nss_files.h>
NSS_DECLARE_MODULE_FUNCTIONS (files)
@@ -64,7 +65,7 @@ _nss_files_setnetgrent (const char *group, struct __netgrent *result)
return NSS_STATUS_UNAVAIL;
/* Find the netgroups file and open it. */
fp = fopen (DATAFILE, "rce");
fp = __nss_files_fopen (DATAFILE);
if (fp == NULL)
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
else
@@ -78,8 +79,6 @@ _nss_files_setnetgrent (const char *group, struct __netgrent *result)
status = NSS_STATUS_NOTFOUND;
result->cursor = result->data;
__fsetlocking (fp, FSETLOCKING_BYCALLER);
while (!feof_unlocked (fp))
{
ssize_t curlen = getline (&line, &line_len, fp);