From 71d3bda9a7a15bf3f935ffcde8aeceefef8074f7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 25 Aug 1999 17:19:50 +0000 Subject: Update. 1999-08-25 Ulrich Drepper * inet/Makefile (routines): Add getipnodebynm. * inet/getipnodebynm.c: New file. * nss/digits_dots.c: If HAVE_TYPE is define type contains the interface type. * nss/nss_files/files-XXX.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and EXTRA_ARGS_VALUE is not already done. (internal_getent): Allow extra parameters and pass them to parse_line. (_nss_files_get,ENTNAME_r): Pass extra parameters to internal_getent. (_nss_files_get##name##_r): Likewise. * nss/nss_files/files-hosts.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and EXTRA_ARGS_VALUE to pass flags and type to parser. Add getipnodebyname function. * nss/nss_files/files-parse.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and EXTRA_ARGS_VALUE is not already done. (parse_line): Add EXTRA_ARGS_DECL to parameter list. * nss/nss_db/db-XXX.c (lookup): Allow extra parameters and pass them to parse_line. (_nss_db_get##name##_r): Pass extra parameters to lookup. (_nss_db_get,ENTNAME_r): Likewise. * sysdeps/generic/if_index.c (__protocol_available): New function. * sysdeps/unix/sysv/linux/if_index.c: Likewise. --- nss/nss_files/files-XXX.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'nss/nss_files/files-XXX.c') diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c index d145001..6dd5919 100644 --- a/nss/nss_files/files-XXX.c +++ b/nss/nss_files/files-XXX.c @@ -50,6 +50,12 @@ # define H_ERRNO_SET(val) ((void) 0) #endif +#ifndef EXTRA_ARGS +# define EXTRA_ARGS +# define EXTRA_ARGS_DECL +# define EXTRA_ARGS_VALUE +#endif + /* Locks the static variables in this file. */ __libc_lock_define_initialized (static, lock) @@ -161,7 +167,8 @@ CONCAT(_nss_files_end,ENTNAME) (void) static enum nss_status internal_getent (struct STRUCTURE *result, - char *buffer, size_t buflen, int *errnop H_ERRNO_PROTO) + char *buffer, size_t buflen, int *errnop H_ERRNO_PROTO + EXTRA_ARGS_DECL) { char *p; struct parser_data *data = (void *) buffer; @@ -204,7 +211,8 @@ 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, errnop))); + || ! (parse_result = parse_line (p, result, data, buflen, errnop + EXTRA_ARGS))); /* Filled in RESULT with the next entry from the database file. */ return parse_result == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_SUCCESS; @@ -249,7 +257,7 @@ CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer, if (status == NSS_STATUS_SUCCESS) { status = internal_getent (result, buffer, buflen, errnop - H_ERRNO_ARG); + H_ERRNO_ARG EXTRA_ARGS_VALUE); /* Remember this position if we were successful. If the operation failed we give the user a chance to repeat the @@ -298,7 +306,7 @@ _nss_files_get##name##_r (proto, \ last_use = getby; \ \ while ((status = internal_getent (result, buffer, buflen, errnop \ - H_ERRNO_ARG)) \ + H_ERRNO_ARG EXTRA_ARGS_VALUE)) \ == NSS_STATUS_SUCCESS) \ { break_if_match } \ \ -- cgit v1.1