mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-06 14:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct result of parse_line correctly.

Browse Source
This commit is contained in:
Ulrich Drepper 1997-04-05 00:47:27 +00:00
parent d97aad47e3
commit b8a7384521
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grp/fgetgrent_r.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
/* Copyright (C) 1991, 1996, 1997 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
@ -56,6 +56,7 @@ __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen,
struct group **result)
{
char *p;
int parse_result;
do
{
@ -69,10 +70,18 @@ __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen,
/* Skip leading blanks. */
while (isspace (*p))
++p;
} while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
} 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));
|| ! (parse_result = parse_line (p, resbuf,
(void *) buffer, buflen)));
if (parse_result == -1)
{
/* The parser ran out of space. */
*result = NULL;
return errno;
}
*result = resbuf;
return 0;

7
nss/nss_files/files-XXX.c
View File

@ -1,5 +1,5 @@
/* Common code for file-based databases in nss_files module.
Copyright (C) 1996 Free Software Foundation, Inc.
Copyright (C) 1996, 1997 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
@ -146,6 +146,7 @@ internal_getent (struct STRUCTURE *result,
char *p;
struct parser_data *data = (void *) buffer;
int linebuflen = buffer + buflen - data->linebuffer;
int parse_result;
if (buflen < (int) sizeof *data + 1)
{
@ -182,10 +183,10 @@ internal_getent (struct STRUCTURE *result,
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, result, data, buflen));
|| ! (parse_result = parse_line (p, result, data, buflen)));
/* Filled in RESULT with the next entry from the database file. */
return NSS_STATUS_SUCCESS;
return parse_result == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_SUCCESS;
}

5
shadow/sgetspent_r.c
View File

@ -90,8 +90,9 @@ int
__sgetspent_r (const char *string, struct spwd *resbuf, char *buffer,
size_t buflen, struct spwd **result)
{
*result = parse_line (strncpy (buffer, string, buflen), resbuf, NULL, 0)
? resbuf : NULL;
int parse_result = parse_line (strncpy (buffer, string, buflen),
resbuf, NULL, 0);
*result = parse_result > 0 ? resbuf : NULL;
return *result == NULL ? errno : 0;
}