.
[kopensolaris-gnu/glibc.git] / nss / getXXbyYY.c
index 0df916b..a9f1cfd 100644 (file)
@@ -1,49 +1,51 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2001 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
+#include <assert.h>
 #include <errno.h>
 #include <bits/libc-lock.h>
 #include <stdlib.h>
+#include <resolv.h>
 
 #include "nsswitch.h"
 
 /*******************************************************************\
 |* Here we assume several symbols to be defined:                  *|
-|*                                                                *|
+|*                                                                *|
 |* LOOKUP_TYPE   - the return type of the function                *|
-|*                                                                *|
+|*                                                                *|
 |* FUNCTION_NAME - name of the non-reentrant function             *|
-|*                                                                *|
+|*                                                                *|
 |* DATABASE_NAME - name of the database the function accesses     *|
 |*                (e.g., host, services, ...)                     *|
-|*                                                                *|
+|*                                                                *|
 |* ADD_PARAMS    - additional parameter, can vary in number       *|
-|*                                                                *|
+|*                                                                *|
 |* ADD_VARIABLES - names of additional parameter                  *|
-|*                                                                *|
+|*                                                                *|
 |* BUFLEN       - length of buffer allocated for the non          *|
 |*                reentrant version                               *|
-|*                                                                *|
+|*                                                                *|
 |* Optionally the following vars can be defined:                  *|
-|*                                                                *|
+|*                                                                *|
 |* NEED_H_ERRNO  - an extra parameter will be passed to point to   *|
 |*                the global `h_errno' variable.                  *|
-|*                                                                *|
+|*                                                                *|
 \*******************************************************************/
 
 /* To make the real sources a bit prettier.  */
 #ifdef NEED_H_ERRNO
 # define H_ERRNO_PARM , int *h_errnop
 # define H_ERRNO_VAR , &h_errno_tmp
+# define H_ERRNO_VAR_P &h_errno_tmp
 #else
 # define H_ERRNO_PARM
 # define H_ERRNO_VAR
+# define H_ERRNO_VAR_P NULL
 #endif
 
+#ifndef HAVE_TYPE
+# define TYPE_VAR_P NULL
+# define FLAGS_VAR 0
+#endif
+
+#ifdef HAVE_AF
+# define AF_VAR_P &af
+#else
+# define AF_VAR_P NULL
+#endif
 
 /* Prototype for reentrant version we use here.  */
 extern int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf,
@@ -71,11 +85,13 @@ extern int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf,
 /* We need to protect the dynamic buffer handling.  */
 __libc_lock_define_initialized (static, lock);
 
+/* This points to the static buffer used.  */
+libc_freeres_ptr (static char *buffer);
+
 
 LOOKUP_TYPE *
 FUNCTION_NAME (ADD_PARAMS)
 {
-  static char *buffer;
   static size_t buffer_size;
   static LOOKUP_TYPE resbuf;
   LOOKUP_TYPE *result;
@@ -93,20 +109,26 @@ FUNCTION_NAME (ADD_PARAMS)
       buffer = malloc (buffer_size);
     }
 
+#ifdef HANDLE_DIGITS_DOTS
   if (buffer != NULL)
     {
-#ifdef HANDLE_DIGITS_DOTS
-# include "digits_dots.c"
-#endif
+      if (__nss_hostname_digits_dots (name, &resbuf, &buffer,
+                                     &buffer_size,
+                                     0, &result, NULL, TYPE_VAR_P,
+                                     FLAGS_VAR, AF_VAR_P,
+                                     H_ERRNO_VAR_P))
+       goto done;
     }
+#endif
 
   while (buffer != NULL
-        && INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, &resbuf, buffer,
-                                      buffer_size, &result H_ERRNO_VAR) != 0
+        && (INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, &resbuf, buffer,
+                                       buffer_size, &result H_ERRNO_VAR)
+            == ERANGE)
 #ifdef NEED_H_ERRNO
         && h_errno_tmp == NETDB_INTERNAL
 #endif
-        && errno == ERANGE)
+        )
     {
       char *new_buf;
       buffer_size += BUFLEN;
@@ -117,7 +139,6 @@ FUNCTION_NAME (ADD_PARAMS)
             process gets a chance for a normal termination.  */
          save = errno;
          free (buffer);
-         buffer = NULL;
          __set_errno (save);
        }
       buffer = new_buf;