diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-04-02 14:47:34 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-04-02 14:47:34 +0000 |
commit | 22d57dd3690a0fe623de1a56036306a93fa9a945 (patch) | |
tree | 72d15a44833db599574dc62e78ea02e8d30567e3 /nss/nss_files | |
parent | 5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5 (diff) | |
download | glibc-22d57dd3690a0fe623de1a56036306a93fa9a945.tar glibc-22d57dd3690a0fe623de1a56036306a93fa9a945.tar.gz glibc-22d57dd3690a0fe623de1a56036306a93fa9a945.tar.bz2 glibc-22d57dd3690a0fe623de1a56036306a93fa9a945.zip |
Update.
1997-04-02 16:28 Ulrich Drepper <drepper@cygnus.com>
* grp/fgetgrent.c: Don't use fixed buffer length. Allow dynamic
adjustment if the underlying function say it is too small.
* pwd/fgetpwent.c: Likewise.
* shadow/fgetspent.c: Likewise.
* shadow/sgetspent.c: Likewise.
* grp/fgetgrent_r.c (__fgetgrent_r): If `parse_result' returns -1
this means there was not enough room for the gr_mem array.
* nss/nss_files/files-XXX.c: Leave loop and return error if
`parse_result' returns -1.
* nss/nss_files/files-parse.c (parse_line): Return -1 if parsing
of trailing list fails because of low memory.
(parse_list): Rewrite. The logic was completly incorrect since
the checks for overflowing the array were not executed when
needed.
* shadow/sgetspent_r.c: Only a return value > 0 from parse_line
signals success.
* nss/getXXbyYY.c: Make sure NULL is returned if we ran out of memory.
* nss/getXXent.c: Likewise.
* stdlib/strtod.c (SET_MANTISSA): Make sure that at least one bit
is set in mantissa.
* stdlib/strtof.c: Likewise.
* stdlib/strtold.c: Likewise.
* wcsmbs/wcstof.c: Likewise.
* wcsmbs/wcstold.c: Likewise.
* sysdeps/libm-ieee754/s_nan.c: Use strtod is parameter is not empty
string.
* sysdeps/libm-ieee754/s_nanf.c: Likewise.
* sysdeps/libm-ieee754/s_nanld.c: Likewise.
1997-04-02 13:56 Ulrich Drepper <drepper@cygnus.com>
* manual/errno.texi: Add description of strerror_r.
1997-04-01 19:07 H.J. Lu (hjl@gnu.ai.mit.edu)
* manual/errno.texi: Add ENOMEDIUM and EMEDIUMTYPE.
1997-04-02 13:55 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/gnu/errlist.awk: The Texinfo file is named errno.texi.
1997-03-30 10:59 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/fpu/s_cexp.c: New file.
* sysdeps/m68k/fpu/s_cexpf.c: New file.
* sysdeps/m68k/fpu/s_cexpl.c: New file.
* sysdeps/m68k/fpu/s_nearbyint.c: New file.
* sysdeps/m68k/fpu/s_nearbyintf.c: New file.
* sysdeps/m68k/fpu/s_nearbyintl.c: New file.
* sysdeps/m68k/fpu/s_trunc.c: New file.
* sysdeps/m68k/fpu/s_truncf.c: New file.
* sysdeps/m68k/fpu/s_truncl.c: New file.
* sysdeps/m68k/fpu/s_modf.c: Rewritten.
* sysdeps/m68k/fpu/s_modff.c: Adapted.
* sysdeps/m68k/fpu/s_modfl.c: Likewise.
* sysdeps/m68k/fpu/e_atan2.c: Use __signbit inline.
* sysdeps/m68k/fpu/e_pow.c: Likewise. Write 0.0/0.0 for NaN. Fix
typo in test for `y = 0.5'.
* sysdeps/m68k/fpu/__math.h: Define __trunc, __signbit,
__nearbyint. Remove __modf.
* sysdeps/m68k/Makefile (CFLAGS-s_copysignl.c) [$(subdir)=math]:
Define for gcc bug workaround.
* math/libm-test.c (log2_test): Add epsilon for long double to
"log2 (e)" and "log2 (16)".
(modf_test): Fix test name.
(sqrt_test): Add missing FUNC.
1997-03-29 16:24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/Makefile (CFLAGS-xrquota.c): Fix typo in variable name.
1997-03-28 20:56 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* stdlib/stdlib.h: Declare __clearenv.
1997-03-28 18:03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/libm-ieee754/s_asinhl.c: Fix Ulrich Dreppers mangling of
the last change.
1997-03-28 17:55 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* configure.in: Call AC_CANONICAL_BUILD before referencing
$build. Fix test for BUILD_CC.
1997-04-02 01:29 Philip Blundell <pjb27@cam.ac.uk>
* sysdeps/libm-ieee754/s_log2f.c (__log2f): Fix typo.
1997-03-31 18:53 Philip Blundell <pjb27@cam.ac.uk>
* sysdeps/unix/sysv/linux/net/route.h: Add new IPv6 definitions.
1997-04-01 14:08 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/memset.c: Fix typo.
* sysdeps/stub/fchmod.c: Fix typo.
* sysdeps/stub/fchdir.c: Fix typo.
Reported by Fila Kolodny <fila@ibi.com>.
Diffstat (limited to 'nss/nss_files')
-rw-r--r-- | nss/nss_files/files-XXX.c | 7 | ||||
-rw-r--r-- | nss/nss_files/files-parse.c | 31 |
2 files changed, 18 insertions, 20 deletions
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c index d3ff520227..7472496a10 100644 --- a/nss/nss_files/files-XXX.c +++ b/nss/nss_files/files-XXX.c @@ -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; } diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index 2e84d762f0..acf673da90 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -1,5 +1,5 @@ /* Common code for file-based database parsers 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 @@ -152,7 +152,7 @@ parse_line (char *line, struct STRUCTURE *result, \ if (list) \ result->TRAILING_LIST_MEMBER = list; \ else \ - return 0; \ + return -1; /* -1 indicates we ran out of space. */ \ } static inline char ** @@ -189,29 +189,26 @@ parse_list (char *line, struct parser_data *data, size_t datalen) if (*line == '\0') break; + /* Skip leading white space. This might not be portable but useful. */ + while (isspace (*line)) + ++line; + elt = line; while (1) { - if (TRAILING_LIST_SEPARATOR_P (*line)) - { - *p++ = elt; - *line = '\0'; - do - ++line; - while (isspace (*line)); - elt = line; - } - else if (*line == '\0') + if (*line == '\0' || TRAILING_LIST_SEPARATOR_P (*line)) { - /* End of the line. */ + /* End of the next entry. */ if (line > elt) - /* Last element. */ + /* We really found some data. */ *p++ = elt; - *line = '\0'; + + /* Terminate string if necessary. */ + if (*line != '\0') + *line++ = '\0'; break; } - else - ++line; + ++line; } } *p = NULL; |