(nss_lookup_function): Inclide function.def, not functions.def.

[kopensolaris-gnu/glibc.git] / nss / getXXent_r.c

diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 1d06a94..f2cca25 100644 (file)
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -1,23 +1,23 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
 /* Copyright (C) 1996 Free Software Foundation, Inc.

-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.

 
 

-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.
+   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.

 
 

-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.
+   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.

 
 

-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 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.  */

 
 

-#include <libc-lock.h>
+#include <bits/libc-lock.h>

 
 #include "nsswitch.h"
 
 
 #include "nsswitch.h"
 


@@ -48,17 +48,17 @@ Boston, MA 02111-1307, USA.  */
 
 /* To make the real sources a bit prettier.  */
 #define REENTRANT_GETNAME APPEND_R (GETFUNC_NAME)
 
 /* To make the real sources a bit prettier.  */
 #define REENTRANT_GETNAME APPEND_R (GETFUNC_NAME)

-#define APPEND_R(name) APPEND_R1 (name)
-#define APPEND_R1(name) name##_r
-#define INTERNAL(name) INTERNAL1 (name)
-#define INTERNAL1(name) __##name
+#define APPEND_R(Name) CONCAT2_2 (Name, _r)
+#define INTERNAL(Name) CONCAT2_2 (__, Name)
+#define CONCAT2_1(Pre, Post) CONCAT2_2 (Pre, Post)
+#define CONCAT2_2(Pre, Post) Pre##Post

 
 #define SETFUNC_NAME_STRING STRINGIZE (SETFUNC_NAME)
 #define GETFUNC_NAME_STRING STRINGIZE (REENTRANT_GETNAME)
 #define ENDFUNC_NAME_STRING STRINGIZE (ENDFUNC_NAME)
 #define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)
 
 #define SETFUNC_NAME_STRING STRINGIZE (SETFUNC_NAME)
 #define GETFUNC_NAME_STRING STRINGIZE (REENTRANT_GETNAME)
 #define ENDFUNC_NAME_STRING STRINGIZE (ENDFUNC_NAME)
 #define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)

-#define STRINGIZE(name) STRINGIZE1 (name)
-#define STRINGIZE1(name) #name
+#define STRINGIZE(Name) STRINGIZE1 (Name)
+#define STRINGIZE1(Name) #Name

 
 #define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
 #define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
 
 #define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
 #define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)


@@ -74,9 +74,13 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* Some databases take the `stayopen' flag.  */
 #endif
 
 /* Some databases take the `stayopen' flag.  */

-#ifndef STAYOPEN
-#define STAYOPEN void
-#define STAYOPEN_VAR
+#ifdef STAYOPEN
+# define STAYOPEN_TMP CONCAT2_1 (STAYOPEN, _tmp)
+# define STAYOPEN_TMPVAR CONCAT2_1 (STAYOPEN_VAR, _tmp)
+#else
+# define STAYOPEN void
+# define STAYOPEN_VAR
+# define STAYOPEN_TMPVAR

 #endif
 
 /* Prototype for the setXXXent functions we use here.  */
 #endif
 
 /* Prototype for the setXXXent functions we use here.  */


@@ -86,15 +90,24 @@ typedef int (*set_function) (STAYOPEN);
 typedef int (*end_function) (void);
 
 /* Prototype for the setXXXent functions we use here.  */
 typedef int (*end_function) (void);
 
 /* Prototype for the setXXXent functions we use here.  */

-typedef int (*get_function) (LOOKUP_TYPE *, char *, int H_ERRNO_PARM);
+typedef int (*get_function) (LOOKUP_TYPE *, char *, size_t H_ERRNO_PARM);

 
 
 /* This handle for the NSS data base is shared between all
    set/get/endXXXent functions.  */
 static service_user *nip;
 
 
 /* This handle for the NSS data base is shared between all
    set/get/endXXXent functions.  */
 static service_user *nip;

+/* Remember the last service used since the last call to  `endXXent'.  */
+static service_user *last_nip;

 /* Remember the first service_entry, it's always the same.  */
 static service_user *startp;
 
 /* Remember the first service_entry, it's always the same.  */
 static service_user *startp;
 

+#ifdef STAYOPEN_TMP
+/* We need to remember the last `stayopen' flag given by the user
+   since the `setent' function is only called for the first available
+   service.  */
+static STAYOPEN_TMP;
+#endif
+

 /* Protect above variable against multiple uses at the same time.  */
 __libc_lock_define_initialized (static, lock)
 
 /* Protect above variable against multiple uses at the same time.  */
 __libc_lock_define_initialized (static, lock)
 


@@ -111,9 +124,9 @@ setup (void **fctp, const char *func_name, int all)
   if (startp == NULL)
     {
       no_more = DB_LOOKUP_FCT (&nip, func_name, fctp);
   if (startp == NULL)
     {
       no_more = DB_LOOKUP_FCT (&nip, func_name, fctp);

-      startp = no_more ? (service_user *) -1 : nip;
+      startp = no_more ? (service_user *) -1l : nip;

     }
     }

-  else if (startp == (service_user *) -1)
+  else if (startp == (service_user *) -1l)

     /* No services at all.  */
     return 1;
   else
     /* No services at all.  */
     return 1;
   else


@@ -137,22 +150,30 @@ SETFUNC_NAME (STAYOPEN)
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);

-      return NULL;
+      return;

     }
 #endif /* need _res */
 
   __libc_lock_lock (lock);
 
     }
 #endif /* need _res */
 
   __libc_lock_lock (lock);
 

-  /* Cycle through all the services and run their setXXent functions.  */
+  /* Cycle through the services and run their `setXXent' functions until
+     we find an available service.  */

   no_more = setup ((void **) &fct, SETFUNC_NAME_STRING, 1);
   while (! no_more)
     {
   no_more = setup ((void **) &fct, SETFUNC_NAME_STRING, 1);
   while (! no_more)
     {

-      /* Ignore status, we force check in __NSS_NEXT.  */
-      (void) (*fct) (STAYOPEN_VAR);
+      int is_last_nip = nip == last_nip;
+      enum nss_status status = (*fct) (STAYOPEN_VAR);

 
 

-      no_more = __nss_next (&nip, SETFUNC_NAME_STRING, (void **) &fct, 0, 1);
+      no_more = __nss_next (&nip, SETFUNC_NAME_STRING, (void **) &fct,
+                           status, 0);
+      if (is_last_nip)
+       last_nip = nip;

     }
 
     }
 

+#ifdef STAYOPEN_TMP
+  STAYOPEN_TMPVAR = STAYOPEN_VAR;
+#endif
+

   __libc_lock_unlock (lock);
 }
 
   __libc_lock_unlock (lock);
 }
 


@@ -167,7 +188,7 @@ ENDFUNC_NAME (void)
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);

-      return NULL;
+      return;

     }
 #endif /* need _res */
 
     }
 #endif /* need _res */
 


@@ -180,8 +201,13 @@ ENDFUNC_NAME (void)
       /* Ignore status, we force check in __NSS_NEXT.  */
       (void) (*fct) ();
 
       /* Ignore status, we force check in __NSS_NEXT.  */
       (void) (*fct) ();
 

+      if (nip == last_nip)
+       /* We have processed all services which were used.  */
+       break;
+

       no_more = __nss_next (&nip, ENDFUNC_NAME_STRING, (void **) &fct, 0, 1);
     }
       no_more = __nss_next (&nip, ENDFUNC_NAME_STRING, (void **) &fct, 0, 1);
     }

+  last_nip = nip = NULL;

 
   __libc_lock_unlock (lock);
 }
 
   __libc_lock_unlock (lock);
 }


@@ -199,7 +225,8 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);

-      return NULL;
+      *result = NULL;
+      return -1;

     }
 #endif /* need _res */
 
     }
 #endif /* need _res */
 


@@ -214,15 +241,37 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
   no_more = setup ((void **) &fct, GETFUNC_NAME_STRING, 0);
   while (! no_more)
     {
   no_more = setup ((void **) &fct, GETFUNC_NAME_STRING, 0);
   while (! no_more)
     {

+      int is_last_nip = nip == last_nip;
+      service_user *current_nip = nip;
+

       status = (*fct) (resbuf, buffer, buflen H_ERRNO_VAR);
 
       no_more = __nss_next (&nip, GETFUNC_NAME_STRING, (void **) &fct,
                            status, 0);
       status = (*fct) (resbuf, buffer, buflen H_ERRNO_VAR);
 
       no_more = __nss_next (&nip, GETFUNC_NAME_STRING, (void **) &fct,
                            status, 0);

+
+      if (is_last_nip)
+       last_nip = nip;
+
+      if (! no_more && current_nip != nip)
+       /* Call the `setXXent' function.  This wasn't done before.  */
+       do
+         {
+           set_function sfct;
+
+           no_more = __nss_lookup (&nip, SETFUNC_NAME_STRING,
+                                   (void **) &sfct);
+
+           if (! no_more)
+             status = (*sfct) (STAYOPEN_TMPVAR);
+           else
+             status = NSS_STATUS_NOTFOUND;
+         }
+       while (! no_more && status != NSS_STATUS_SUCCESS);

     }
 
   __libc_lock_unlock (lock);
 
     }
 
   __libc_lock_unlock (lock);
 

-  *result = NSS_STATUS_SUCCESS ? resbuf : NULL;
+  *result = status == NSS_STATUS_SUCCESS ? resbuf : NULL;

   return status == NSS_STATUS_SUCCESS ? 0 : -1;
 }
 #define do_weak_alias(n1, n2) weak_alias (n1, n2)
   return status == NSS_STATUS_SUCCESS ? 0 : -1;
 }
 #define do_weak_alias(n1, n2) weak_alias (n1, n2)