From d71b808a96f0fd1b6cd82c41698b518bf345692b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 8 Dec 1997 03:06:47 +0000 Subject: Update. 1997-12-08 03:24 Ulrich Drepper * Makeconfig: Define $(rt) to rt if linuxthreads is available. * Makefile (subdirs): Replace rt by $(rt). * shlib-versions: Use version .2 for NSS modules. * grp/fgetgrent_r.c (LINE_PARSER): Call parse_line with extra argument. * pwd/fgetpwent_r.c: Likewise. * spwd/fgetspent_r.c: Likewise. * spwd/sgetspent_r.c: Likewise. * hesiod/nss_hesiod/hesiod-grp.c (lookup): Add new argument. Store error number in *ERRNOP. Little optimization. * hesiod/nss_hesiod/hesiod-pwd.c: Likewise. * hesiod/nss_hesiod/hesiod-service.c: Likewise. * inet/getnetgrent_r.c (__internal_setnetgrent_reuse): Likewise. (__internal_getnetgrent_r): New argument. Call __internal_setnetgrent_reuse with new argument. (__getnetgrent_r): Call __internal_getnetgrent_r with new argument. * inet/netgroup.h: Add argument to prototypes. * nis/nisplus-parser.h: Likewise. * nis/nss_compat/compat-grp.c: Change everything to store error code through provided pointer and not use errno. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-parser.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_files/files-XXX.c: Likewise * nss/nss_files/files-alias.c: Likewise * nss/nss_files/files-netgrp.c: Likewise * nss/nss_files/files-parse.c: Likewise * nss/getXXbyYY_r.c: Call with __errno_location() as value for new parameter of get functions. * nss/getXXent_r.c: Likewise. * localedata/tst-fmon.c: Print debug info if test fails. * rt/Makefile (routines): Add aio_notify. * rt/aio.h: Remove non-public definitions. Add aioinit stuff. * rt/aio_cancel.c: Rewrite to support lio_listio and aio_suspend. * rt/aio_fsync.c: Likewise. * rt/aio_misc.c: Likewise. * rt/aio_misc.h: Likewise. * rt/aio_read.c: Likewise. * rt/aio_read64.c: Likewise. * rt/aio_suspend.c: Likewise. * rt/aio_write.c: Likewise. * rt/aio_write64.c: Likewise. * rt/lio_listio.c: Likewise. * rt/lio_listio64.c: Likewise. * rt/aio_notify.c: New file. * sysdeps/generic/bits/sigset.h: Pretty print. * sysdeps/posix/pwrite.c: Define weak alias only if function is really defined as __pwrite. * sysdeps/unix/sysv/linux/pread.c: Rewrite to use syscall directly instead of pread64. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=signal] (sysdep_routines): Add rt_sigpending and rt_sigreturn. * sysdeps/unix/sysv/linux/sigaction.c: Use correct value for sigset_t size in syscall. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigreturn.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. Take care for ACT being NULL. * sysdeps/unix/sysv/linux/syscalls.list: Don't mention user for RT signals. * sysdeps/unix/sysv/linux/i386/s_pread64.s: Return ENOSYS if __NR_pread is not defined. * sysdeps/unix/sysv/linux/i386/s_pwrite64.s: Return ENOSYS if __NR_pwrite is not defined. 1997-12-07 11:15 Thorsten Kukuk * nis/nss_compat/compat-grp.c: If buffer is to small, set the file handle for /etc/group back in some more cases. * nis/nss_compat/compat-pwd.c: If buffer is to small, set the file handle for /etc/passwd back in some more cases. * nis/nss_compat/compat-spwd.c: If buffer is to small, set the file handle for /etc/shadow back in some more cases. 1997-12-06 17:00 H.J. Lu * sysdeps/posix/sigblock.c (__sigblock): Don't check int mask beyound its size. * sysdeps/posix/sigsetmask.c (__sigsetmask): Ditto. * sysdeps/posix/sigvec.c (convert_mask, __sigvec): Ditto. 1997-12-06 04:38 Ulrich Drepper * sysdeps/wordsize-32/inttypes.h: Rewrite {str,wcs}to{i,u}max handling. Don't use macros, we need functions. Use inline functions for optimization. * sysdeps/wordsize-64/inttypes.h: Likewise. * sysdeps/wordsize-32/Makefile: Add strtoimax, stroumax, wcstoimax, and wcstoumax. * sysdeps/wordsize-64/Makefile: Likewise. * sysdeps/wordsize-32/Dist: Likewise. * sysdeps/wordsize-64/Dist: Likewise. * sysdeps/wordsize-32/strtoimax.c: New file. * sysdeps/wordsize-32/strtoumax.c: New file. * sysdeps/wordsize-32/wcstoimax.c: New file. * sysdeps/wordsize-32/wcstoumax.c: New file. * sysdeps/wordsize-64/strtoimax.c: New file. * sysdeps/wordsize-64/strtoumax.c: New file. * sysdeps/wordsize-64/wcstoimax.c: New file. * sysdeps/wordsize-64/wcstoumax.c: New file. 1997-12-04 10:40 Philip Blundell * sysdeps/generic/wait3.c (__wait3): Use ANSI-style definition so that transparent union works. * sysdeps/generic/wait4.c (__wait4): Likewise. * sysdeps/generic/wait.c (__wait): Likewise. * sysdeps/generic/getpeername.c (getpeername): Use socklen_t not size_t. * sysdeps/generic/syscall.c (syscall): Return value and arg are long, to match prototype. * malloc/malloc.c (HAVE_MREMAP): Set to 0 for ARM, as we don't have mremap() yet. * sysdeps/generic/usleep.c (usleep): Returns void, to match prototype. * sysdeps/unix/sysv/linux/arm/syscalls.list: New file. * sysdeps/generic/bits/time.h: Use __time_t not time_t. * sysdeps/generic/bits/resource.h: Include for __rlim_t. * sysdeps/standalone/arm/bits/errno.h (ENOTTY): Added. * sysdeps/generic/bits/dirent.h (struct dirent64): Added. * io/sys/stat.h (S_ISLNK): Always false if we don't have __S_IFLNK. * sysdeps/standalone/close.c (_STDIO_H): Define before including . * sysdeps/standalone/filedesc.h (_STDIO_H): Likewise. 1997-12-06 01:09 Ulrich Drepper * posix/sys/wait.h: Don't use transparent unions in C++. 1997-12-05 Andreas Jaeger * time/time.h: Add strfxtime. * libc.map: Add tcgetsid, strcasestr, wmemrtombs, wmemrtowcs, sysv_signal, strfxtime, pread64, pwrite64. 1997-11-30 21:57 Richard Henderson Alpha changes for EGCS: * config.h.in (ASM_ALPHA_NG_SYMBOL_PREFIX): New entry. * configure.in (libc_cv_gcc_alpha_ng_prefix): New check. * sysdeps/alpha/dl-machine.h (_dl_runtime_resolve): Care for prefix. (_start): Likewise. * sysdeps/unix/sysv/linux/alpha/init-first.h: Likewise. --- nss/getXXbyYY_r.c | 8 +++++--- nss/getXXent_r.c | 9 ++++++--- nss/nss_db/db-XXX.c | 22 +++++++++++++--------- nss/nss_db/db-alias.c | 13 +++++++------ nss/nss_db/db-netgrp.c | 8 +++++--- nss/nss_files/files-XXX.c | 23 +++++++++++++---------- nss/nss_files/files-alias.c | 13 +++++++------ nss/nss_files/files-netgrp.c | 10 ++++++---- nss/nss_files/files-parse.c | 10 +++++----- 9 files changed, 67 insertions(+), 49 deletions(-) (limited to 'nss') diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index 18f0bae03a..47df01054e 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include "nsswitch.h" /*******************************************************************\ @@ -71,8 +72,8 @@ /* Type of the lookup function we need here. */ -typedef int (*lookup_function) (ADD_PARAMS, LOOKUP_TYPE *, char *, size_t - H_ERRNO_PARM); +typedef int (*lookup_function) (ADD_PARAMS, LOOKUP_TYPE *, char *, size_t, + int * H_ERRNO_PARM); /* Some usages of this file might use this variable. */ extern struct __res_state _res; @@ -129,7 +130,8 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, while (no_more == 0) { - status = (*fct) (ADD_VARIABLES, resbuf, buffer, buflen H_ERRNO_VAR); + status = (*fct) (ADD_VARIABLES, resbuf, buffer, buflen, + __errno_location () H_ERRNO_VAR); no_more = __nss_next (&nip, REENTRANT_NAME_STRING, (void **) &fct, status, 0); diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index f2cca259f0..1884b0773d 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include "nsswitch.h" @@ -90,7 +91,8 @@ typedef int (*set_function) (STAYOPEN); typedef int (*end_function) (void); /* Prototype for the setXXXent functions we use here. */ -typedef int (*get_function) (LOOKUP_TYPE *, char *, size_t H_ERRNO_PARM); +typedef int (*get_function) (LOOKUP_TYPE *, char *, size_t, int * + H_ERRNO_PARM); /* This handle for the NSS data base is shared between all @@ -244,7 +246,8 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, int is_last_nip = nip == last_nip; service_user *current_nip = nip; - status = (*fct) (resbuf, buffer, buflen H_ERRNO_VAR); + status = (*fct) (resbuf, buffer, buflen, __errno_location () + H_ERRNO_VAR); no_more = __nss_next (&nip, GETFUNC_NAME_STRING, (void **) &fct, status, 0); diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 2f781bf3d9..4d20cae797 100644 --- a/nss/nss_db/db-XXX.c +++ b/nss/nss_db/db-XXX.c @@ -147,9 +147,10 @@ CONCAT(_nss_db_end,ENTNAME) (void) /* Do a database lookup for KEY. */ static enum nss_status lookup (const DBT *key, struct STRUCTURE *result, - void *buffer, int buflen H_ERRNO_PROTO) + void *buffer, size_t buflen, int *errnop H_ERRNO_PROTO) { enum nss_status status; + int err; DBT value; /* Open the database. */ @@ -158,9 +159,12 @@ lookup (const DBT *key, struct STRUCTURE *result, return status; /* Succeed iff it matches a value that parses correctly. */ - status = (((*db->get) (db, key, &value, 0) == 0 && - parse_line (value.data, result, buffer, buflen)) - ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND); + err = ((*db->get) (db, key, &value, 0) == 0 && + parse_line (value.data, result, buffer, buflen, errnop)); + if (err == 0) + status = NSS_STATUS_SUCCESS; + else + status = err < 0 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; if (! keep_db) internal_endent (); @@ -188,7 +192,7 @@ lookup (const DBT *key, struct STRUCTURE *result, enum nss_status \ _nss_db_get##name##_r (proto, \ struct STRUCTURE *result, \ - char *buffer, size_t buflen H_ERRNO_PROTO) \ + char *buffer, size_t buflen, int *errnop H_ERRNO_PROTO)\ { \ DBT key; \ enum nss_status status; \ @@ -196,7 +200,7 @@ _nss_db_get##name##_r (proto, \ key.data = __alloca (size); \ key.size = KEYPRINTF keypattern; \ __libc_lock_lock (lock); \ - status = lookup (&key, result, buffer, buflen H_ERRNO_ARG); \ + status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG); \ __libc_lock_unlock (lock); \ return status; \ } @@ -208,8 +212,8 @@ _nss_db_get##name##_r (proto, \ /* Return the next entry from the database file, doing locking. */ enum nss_status -CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, - char *buffer, size_t buflen H_ERRNO_PROTO) +CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer, + size_t buflen, int *errnop H_ERRNO_PROTO) { /* Return next entry in host file. */ enum nss_status status; @@ -218,7 +222,7 @@ CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, __libc_lock_lock (lock); key.size = 1 + snprintf (key.data = buf, sizeof buf, "0%u", entidx++); - status = lookup (&key, result, buffer, buflen H_ERRNO_ARG); + status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG); __libc_lock_unlock (lock); return status; diff --git a/nss/nss_db/db-alias.c b/nss/nss_db/db-alias.c index 32ba4b5f4f..0e72b92ceb 100644 --- a/nss/nss_db/db-alias.c +++ b/nss/nss_db/db-alias.c @@ -134,7 +134,7 @@ _nss_db_endaliasent (void) the result. */ static enum nss_status lookup (const DBT *key, struct aliasent *result, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { enum nss_status status; DBT value; @@ -154,7 +154,7 @@ lookup (const DBT *key, struct aliasent *result, char *buffer, if (buflen < key->size + 1) { no_more_room: - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -218,7 +218,8 @@ lookup (const DBT *key, struct aliasent *result, char *buffer, } enum nss_status -_nss_db_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen) +_nss_db_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen, + int *errnop) { /* Return next entry in host file. */ enum nss_status status; @@ -227,7 +228,7 @@ _nss_db_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen) __libc_lock_lock (lock); key.size = 1 + snprintf (key.data = buf, sizeof buf, "0%u", entidx++); - status = lookup (&key, result, buffer, buflen); + status = lookup (&key, result, buffer, buflen, errnop); __libc_lock_unlock (lock); return status; @@ -236,7 +237,7 @@ _nss_db_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen) enum nss_status _nss_db_getaliasbyname_r (const char *name, struct aliasent *result, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { DBT key; enum nss_status status; @@ -248,7 +249,7 @@ _nss_db_getaliasbyname_r (const char *name, struct aliasent *result, memcpy (&((char *) key.data)[1], name, key.size - 1); __libc_lock_lock (lock); - status = lookup (&key, result, buffer, buflen); + status = lookup (&key, result, buffer, buflen, errnop); __libc_lock_unlock (lock); return status; diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c index 4691c0fb9b..d63d1cb1af 100644 --- a/nss/nss_db/db-netgrp.c +++ b/nss/nss_db/db-netgrp.c @@ -112,16 +112,18 @@ _nss_db_endnetgrent (void) extern enum nss_status _nss_netgroup_parseline (char **cursor, struct __netgrent *result, - char *buffer, int buflen); + char *buffer, size_t buflen, + int *errnop); enum nss_status -_nss_db_getnetgrent_r (struct __netgrent *result, char *buffer, int buflen) +_nss_db_getnetgrent_r (struct __netgrent *result, char *buffer, size_t buflen, + int *errnop) { int status; __libc_lock_lock (lock); - status = _nss_netgroup_parseline (&cursor, result, buffer, buflen); + status = _nss_netgroup_parseline (&cursor, result, buffer, buflen, errnop); __libc_lock_unlock (lock); diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c index eb0f6fec8f..e3261ed454 100644 --- a/nss/nss_files/files-XXX.c +++ b/nss/nss_files/files-XXX.c @@ -162,7 +162,7 @@ CONCAT(_nss_files_end,ENTNAME) (void) static enum nss_status internal_getent (struct STRUCTURE *result, - char *buffer, int buflen H_ERRNO_PROTO) + char *buffer, int buflen, int *errnop H_ERRNO_PROTO) { char *p; struct parser_data *data = (void *) buffer; @@ -171,7 +171,7 @@ internal_getent (struct STRUCTURE *result, if (buflen < (int) sizeof *data + 1) { - __set_errno (ERANGE); + *errnop = ERANGE; H_ERRNO_SET (NETDB_INTERNAL); return NSS_STATUS_TRYAGAIN; } @@ -185,6 +185,7 @@ internal_getent (struct STRUCTURE *result, if (p == NULL) { /* End of file or read error. */ + *errnop = errno; H_ERRNO_SET (HOST_NOT_FOUND); return NSS_STATUS_NOTFOUND; } @@ -192,7 +193,7 @@ internal_getent (struct STRUCTURE *result, { /* The line is too long. Give the user the opportunity to enlarge the buffer. */ - __set_errno (ERANGE); + *errnop = ERANGE; H_ERRNO_SET (NETDB_INTERNAL); return NSS_STATUS_TRYAGAIN; } @@ -204,7 +205,7 @@ 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_result = parse_line (p, result, data, buflen))); + || ! (parse_result = parse_line (p, result, data, buflen, errnop))); /* Filled in RESULT with the next entry from the database file. */ return parse_result == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_SUCCESS; @@ -213,8 +214,8 @@ internal_getent (struct STRUCTURE *result, /* Return the next entry from the database file, doing locking. */ enum nss_status -CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, - char *buffer, size_t buflen H_ERRNO_PROTO) +CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer, + size_t buflen, int *errnop H_ERRNO_PROTO) { /* Return next entry in host file. */ enum nss_status status = NSS_STATUS_SUCCESS; @@ -237,7 +238,8 @@ CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, if (status == NSS_STATUS_SUCCESS) { - status = internal_getent (result, buffer, buflen H_ERRNO_ARG); + status = internal_getent (result, buffer, buflen, errnop + H_ERRNO_ARG); /* Remember this position if we were successful. If the operation failed we give the user a chance to repeat the @@ -270,8 +272,8 @@ CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, #define DB_LOOKUP(name, keysize, keypattern, break_if_match, proto...) \ enum nss_status \ _nss_files_get##name##_r (proto, \ - struct STRUCTURE *result, \ - char *buffer, size_t buflen H_ERRNO_PROTO) \ + struct STRUCTURE *result, char *buffer, \ + size_t buflen, int *errnop H_ERRNO_PROTO) \ { \ enum nss_status status; \ \ @@ -285,7 +287,8 @@ _nss_files_get##name##_r (proto, \ /* Tell getent function that we have repositioned the file pointer. */ \ last_use = getby; \ \ - while ((status = internal_getent (result, buffer, buflen H_ERRNO_ARG)) \ + while ((status = internal_getent (result, buffer, buflen, errnop \ + H_ERRNO_ARG)) \ == NSS_STATUS_SUCCESS) \ { break_if_match } \ \ diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c index bf4fa8a2f0..7eb22bb187 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c @@ -131,7 +131,7 @@ _nss_files_endaliasent (void) /* Parsing the database file into `struct aliasent' data structures. */ static enum nss_status get_next_alias (const char *match, struct aliasent *result, - char *buffer, size_t buflen) + char *buffer, int *errnop, size_t buflen) { enum nss_status status = NSS_STATUS_NOTFOUND; int ignore = 0; @@ -159,7 +159,7 @@ get_next_alias (const char *match, struct aliasent *result, { /* The line is too long for our buffer. */ no_more_room: - __set_errno (ERANGE); + *errnop = ERANGE; status = NSS_STATUS_TRYAGAIN; break; } @@ -364,7 +364,8 @@ get_next_alias (const char *match, struct aliasent *result, enum nss_status -_nss_files_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen) +_nss_files_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen, + int *errnop) { /* Return next entry in host file. */ enum nss_status status = NSS_STATUS_SUCCESS; @@ -391,7 +392,7 @@ _nss_files_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen) /* Read lines until we get a definite result. */ do - status = get_next_alias (NULL, result, buffer, buflen); + status = get_next_alias (NULL, result, buffer, buflen, errnop); while (status == NSS_STATUS_RETURN); /* If we successfully read an entry remember this position. */ @@ -410,7 +411,7 @@ _nss_files_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen) enum nss_status _nss_files_getaliasbyname_r (const char *name, struct aliasent *result, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { /* Return next entry in host file. */ enum nss_status status = NSS_STATUS_SUCCESS; @@ -433,7 +434,7 @@ _nss_files_getaliasbyname_r (const char *name, struct aliasent *result, /* Read lines until we get a definite result. */ do - status = get_next_alias (name, result, buffer, buflen); + status = get_next_alias (name, result, buffer, buflen, errnop); while (status == NSS_STATUS_RETURN); } diff --git a/nss/nss_files/files-netgrp.c b/nss/nss_files/files-netgrp.c index 7552d4c3b1..eb6e673ad0 100644 --- a/nss/nss_files/files-netgrp.c +++ b/nss/nss_files/files-netgrp.c @@ -162,7 +162,7 @@ _nss_files_endnetgrent (struct __netgrent *result) enum nss_status _nss_netgroup_parseline (char **cursor, struct __netgrent *result, - char *buffer, int buflen) + char *buffer, size_t buflen, int *errnop) { enum nss_status status; const char *host, *user, *domain; @@ -227,7 +227,7 @@ _nss_netgroup_parseline (char **cursor, struct __netgrent *result, to the private buffer we have to make sure it is big enough. */ if (cp - host > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; status = NSS_STATUS_UNAVAIL; } else @@ -258,11 +258,13 @@ _nss_netgroup_parseline (char **cursor, struct __netgrent *result, enum nss_status -_nss_files_getnetgrent_r (struct __netgrent *result, char *buffer, int buflen) +_nss_files_getnetgrent_r (struct __netgrent *result, char *buffer, + size_t buflen, int *errnop) { enum nss_status status; - status = _nss_netgroup_parseline (&result->cursor, result, buffer, buflen); + status = _nss_netgroup_parseline (&result->cursor, result, buffer, buflen, + errnop); return status; } diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index acf673da90..76df1c6ff0 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -69,7 +69,7 @@ struct parser_data /* The parser is defined in a different module. */ extern int parse_line (char *line, struct STRUCTURE *result, - struct parser_data *data, size_t datalen); + struct parser_data *data, size_t datalen, int *errnop); # define LINE_PARSER(EOLSET, BODY) /* Do nothing */ @@ -80,7 +80,7 @@ extern int parse_line (char *line, struct STRUCTURE *result, # define LINE_PARSER(EOLSET, BODY) \ parser_stclass int \ parse_line (char *line, struct STRUCTURE *result, \ - struct parser_data *data, size_t datalen) \ + struct parser_data *data, size_t datalen, int *errnop) \ { \ ENTDATA_DECL (data) \ char *p = strpbrk (line, EOLSET "\n"); \ @@ -148,7 +148,7 @@ parse_line (char *line, struct STRUCTURE *result, \ # define TRAILING_LIST_PARSER \ { \ - char **list = parse_list (line, data, datalen); \ + char **list = parse_list (line, data, datalen, errnop); \ if (list) \ result->TRAILING_LIST_MEMBER = list; \ else \ @@ -156,7 +156,7 @@ parse_line (char *line, struct STRUCTURE *result, \ } static inline char ** -parse_list (char *line, struct parser_data *data, size_t datalen) +parse_list (char *line, struct parser_data *data, size_t datalen, int *errnop) { char *eol, **list, **p; @@ -183,7 +183,7 @@ parse_list (char *line, struct parser_data *data, size_t datalen) if ((size_t) ((char *) &p[1] - (char *) data) > datalen) { /* We cannot fit another pointer in the buffer. */ - __set_errno (ERANGE); + *errnop = ERANGE; return NULL; } if (*line == '\0') -- cgit v1.2.3