Optimize a bit by using mempcpy.

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

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 9f27ef8..36c1d00 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,42 +1,48 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   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 <ctype.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <netdb.h>
 
 #include <ctype.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <netdb.h>

-#include <libc-lock.h>
+#include <bits/libc-lock.h>
+#include <link.h>      /* We need some help from ld.so.  */

 #include <search.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <search.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

+#if !defined DO_STATIC_NSS || defined PIC
+# include <gnu/lib-names.h>
+#endif
+

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

-#include "../elf/link.h"       /* We need some help from ld.so.  */

 
 /* Prototypes for the local functions.  */
 
 /* Prototypes for the local functions.  */

-static void *nss_lookup_function (service_user *ni, const char *fct_name);
-static name_database *nss_parse_file (const char *fname);
-static name_database_entry *nss_getline (char *line);
-static service_user *nss_parse_service_list (const char *line);
+static void *nss_lookup_function (service_user *ni, const char *fct_name)
+     internal_function;
+static name_database *nss_parse_file (const char *fname) internal_function;
+static name_database_entry *nss_getline (char *line) internal_function;
+static service_user *nss_parse_service_list (const char *line)
+     internal_function;

 static service_library *nss_new_service (name_database *database,
 static service_library *nss_new_service (name_database *database,

-                                        const char *name);
+                                        const char *name) internal_function;

 
 
 /* Declare external database variables.  */
 
 
 /* Declare external database variables.  */


@@ -63,9 +69,10 @@ static struct
 __libc_lock_define_initialized (static, lock)
 
 
 __libc_lock_define_initialized (static, lock)
 
 

-/* Nonzero if the sevices are already initialized.  */
-static int nss_initialized;
-
+#if !defined DO_STATIC_NSS || defined PIC
+/* String with revision number of the shared object files.  */
+static const char *const __nss_shlib_revision = LIBNSS_FILES_SO + 15;
+#endif

 
 /* The root of the whole data base.  */
 static name_database *service_table;
 
 /* The root of the whole data base.  */
 static name_database *service_table;


@@ -74,8 +81,8 @@ static name_database *service_table;
 /* -1 == database not found
     0 == database entry pointer stored */
 int
 /* -1 == database not found
     0 == database entry pointer stored */
 int

-__nss_database_lookup (const char *database, const char *defconfig,
-                      service_user **ni)
+__nss_database_lookup (const char *database, const char *alternate_name,
+                      const char *defconfig, service_user **ni)

 {
   /* Prevent multiple threads to change the service table.  */
   __libc_lock_lock (lock);
 {
   /* Prevent multiple threads to change the service table.  */
   __libc_lock_lock (lock);


@@ -88,7 +95,8 @@ __nss_database_lookup (const char *database, const char *defconfig,
       return 0;
     }
 
       return 0;
     }
 

-  if (nss_initialized == 0 && service_table == NULL)
+  /* Are we initialized yet?  */
+  if (service_table == NULL)

     /* Read config file.  */
     service_table = nss_parse_file (_PATH_NSSWITCH_CONF);
 
     /* Read config file.  */
     service_table = nss_parse_file (_PATH_NSSWITCH_CONF);
 


@@ -103,6 +111,13 @@ __nss_database_lookup (const char *database, const char *defconfig,
       for (entry = service_table->entry; entry != NULL; entry = entry->next)
        if (strcmp (database, entry->name) == 0)
          *ni = entry->service;
       for (entry = service_table->entry; entry != NULL; entry = entry->next)
        if (strcmp (database, entry->name) == 0)
          *ni = entry->service;

+
+      if (*ni == NULL && alternate_name != NULL)
+       /* We haven't found an entry so far.  Try to find it with the
+          alternative name.  */
+       for (entry = service_table->entry; entry != NULL; entry = entry->next)
+         if (strcmp (alternate_name, entry->name) == 0)
+           *ni = entry->service;

     }
 
   /* No configuration data is available, either because nsswitch.conf
     }
 
   /* No configuration data is available, either because nsswitch.conf


@@ -112,7 +127,7 @@ __nss_database_lookup (const char *database, const char *defconfig,
      or null to use the most common default.  */
   if (*ni == NULL)
     *ni = nss_parse_service_list (defconfig
      or null to use the most common default.  */
   if (*ni == NULL)
     *ni = nss_parse_service_list (defconfig

-                                 ?: "compat [NOTFOUND=return] files");
+                                 ?: "nis [NOTFOUND=return] files");

 
   __libc_lock_unlock (lock);
 
 
   __libc_lock_unlock (lock);
 


@@ -193,7 +208,7 @@ __nss_configure_lookup (const char *dbname, const char *service_line)
       int cmp = strcmp (dbname, databases[cnt].name);
       if (cmp == 0)
        break;
       int cmp = strcmp (dbname, databases[cnt].name);
       if (cmp == 0)
        break;

-      if (cmp > 0)
+      if (cmp < 0)

        {
          __set_errno (EINVAL);
          return -1;
        {
          __set_errno (EINVAL);
          return -1;


@@ -232,14 +247,15 @@ __nss_configure_lookup (const char *dbname, const char *service_line)
 }
 
 
 }
 
 

+#if !defined DO_STATIC_NSS || defined PIC

 static int
 static int

-nss_dlerror_run (void (*operate) (void))
+nss_dlerror_run (void (*operate) (void *), void *args)

 {
   char *last_errstring = NULL;
   const char *last_object_name = NULL;
   int result;
 
 {
   char *last_errstring = NULL;
   const char *last_object_name = NULL;
   int result;
 

-  (void) _dl_catch_error (&last_errstring, &last_object_name, operate);
+  (void) _dl_catch_error (&last_errstring, &last_object_name, operate, args);

 
   result = last_errstring != NULL;
   if (result)
 
   result = last_errstring != NULL;
   if (result)


@@ -249,6 +265,43 @@ nss_dlerror_run (void (*operate) (void))
 }
 
 
 }
 
 

+struct do_open_args
+{
+  /* Argument to do_open.  */
+  char *shlib_name;
+  service_user *ni;
+};
+
+struct get_sym_args
+{
+  /* Arguments to get_sym.  */
+  struct link_map *map;
+  char *name;
+
+  /* Return values of get_sym.  */
+  ElfW(Addr) loadbase;
+  const ElfW(Sym) *ref;
+};
+
+static void
+do_open (void *a)
+{
+  struct do_open_args *args = (struct do_open_args *) a;
+  /* Open and relocate the shared object.  */
+  args->ni->library->lib_handle = _dl_open (args->shlib_name, RTLD_LAZY);
+}
+
+static void
+get_sym (void *a)
+{
+  struct get_sym_args *args = (struct get_sym_args *) a;
+  struct link_map *scope[2] = { args->map, NULL };
+  args->ref = NULL;
+  args->loadbase = _dl_lookup_symbol (args->name, &args->ref,
+                                     scope, args->map->l_name, 0);
+}
+#endif
+

 /* Comparison function for searching NI->known tree.  */
 static int
 known_compare (const void *p1, const void *p2)
 /* Comparison function for searching NI->known tree.  */
 static int
 known_compare (const void *p1, const void *p2)


@@ -259,6 +312,7 @@ known_compare (const void *p1, const void *p2)
 
 
 static void *
 
 
 static void *

+internal_function

 nss_lookup_function (service_user *ni, const char *fct_name)
 {
   void **found, *result;
 nss_lookup_function (service_user *ni, const char *fct_name)
 {
   void **found, *result;


@@ -319,30 +373,30 @@ nss_lookup_function (service_user *ni, const char *fct_name)
                }
            }
 
                }
            }
 

+#if !defined DO_STATIC_NSS || defined PIC

          if (ni->library->lib_handle == NULL)
            {
              /* Load the shared library.  */
              size_t shlen = (7 + strlen (ni->library->name) + 3
          if (ni->library->lib_handle == NULL)
            {
              /* Load the shared library.  */
              size_t shlen = (7 + strlen (ni->library->name) + 3

-                             + sizeof (NSS_SHLIB_REVISION));
-             char shlib_name[shlen];
+                             + strlen (__nss_shlib_revision) + 1);

 
 

-             void do_open (void)
-               {
-                 /* Open and relocate the shared object.  */
-                 ni->library->lib_handle = _dl_open (shlib_name, RTLD_LAZY);
-               }
+             struct do_open_args args;
+             args.shlib_name = __alloca (shlen);
+             args.ni = ni;

 
              /* Construct shared object name.  */
 
              /* Construct shared object name.  */

-             __stpcpy (__stpcpy (__stpcpy (shlib_name, "libnss_"),
-                                 ni->library->name),
-                       ".so" NSS_SHLIB_REVISION);
+             __stpcpy (__stpcpy (__stpcpy (__stpcpy (args.shlib_name,
+                                                     "libnss_"),
+                                           ni->library->name),
+                                 ".so"),
+                       __nss_shlib_revision);

 
 

-             if (nss_dlerror_run (do_open) != 0)
+             if (nss_dlerror_run (do_open, &args) != 0)

                /* Failed to load the library.  */
                /* Failed to load the library.  */

-               ni->library->lib_handle = (void *) -1;
+               ni->library->lib_handle = (void *) -1l;

            }
 
            }
 

-         if (ni->library->lib_handle == (void *) -1)
+         if (ni->library->lib_handle == (void *) -1l)

            /* Library not found => function not found.  */
            result = NULL;
          else
            /* Library not found => function not found.  */
            result = NULL;
          else


@@ -350,27 +404,66 @@ nss_lookup_function (service_user *ni, const char *fct_name)
              /* Get the desired function.  Again,  GNU ld.so magic ahead.  */
              size_t namlen = (5 + strlen (ni->library->name) + 1
                               + strlen (fct_name) + 1);
              /* Get the desired function.  Again,  GNU ld.so magic ahead.  */
              size_t namlen = (5 + strlen (ni->library->name) + 1
                               + strlen (fct_name) + 1);

-             char name[namlen];
-             struct link_map *map = ni->library->lib_handle;
-             ElfW(Addr) loadbase;
-             const ElfW(Sym) *ref = NULL;
-             void get_sym (void)
-               {
-                 struct link_map *scope[2] = { map, NULL };
-                 loadbase = _dl_lookup_symbol (name, &ref,
-                                               scope, map->l_name, 0);
-               }
+             struct get_sym_args args;
+             args.name = __alloca (namlen);
+             args.map = ni->library->lib_handle;

 
              /* Construct the function name.  */
 
              /* Construct the function name.  */

-             __stpcpy (__stpcpy (__stpcpy (__stpcpy (name, "_nss_"),
+             __stpcpy (__stpcpy (__stpcpy (__stpcpy (args.name, "_nss_"),

                                            ni->library->name),
                                  "_"),
                        fct_name);
 
              /* Look up the symbol.  */
                                            ni->library->name),
                                  "_"),
                        fct_name);
 
              /* Look up the symbol.  */

-             result = (nss_dlerror_run (get_sym)
-                       ? NULL : (void *) (loadbase + ref->st_value));
+             result = (nss_dlerror_run (get_sym, &args) ? NULL
+                       : (void *) (args.loadbase + args.ref->st_value));

            }
            }

+#else
+         /* We can't get function address dynamically in static linking. */
+         {
+# define DEFINE_ENT(h,nm)                                                    \
+           extern void _nss_##h##_get##nm##ent_r (void);                     \
+           extern void _nss_##h##_end##nm##ent (void);                       \
+           extern void _nss_##h##_set##nm##ent (void);
+# define DEFINE_GET(h,nm)                                                    \
+           extern void _nss_##h##_get##nm##_r (void);
+# define DEFINE_GETBY(h,nm,ky)                                               \
+           extern void _nss_##h##_get##nm##by##ky##_r (void);
+# include "function.def"
+# undef DEFINE_ENT
+# undef DEFINE_GET
+# undef DEFINE_GETBY
+# define DEFINE_ENT(h,nm)                                                    \
+           { #h"_get"#nm"ent_r", _nss_##h##_get##nm##ent_r },                \
+           { #h"_end"#nm"ent", _nss_##h##_end##nm##ent },                    \
+           { #h"_set"#nm"ent", _nss_##h##_set##nm##ent },
+# define DEFINE_GET(h,nm)                                                    \
+           { #h"_get"#nm"_r", _nss_##h##_get##nm##_r },
+# define DEFINE_GETBY(h,nm,ky)                                               \
+           { #h"_get"#nm"by"#ky"_r", _nss_##h##_get##nm##by##ky##_r },
+           static struct fct_tbl { const char *fname; void *fp; } *tp, tbl[] =
+             {
+# include "function.def"
+               { NULL, NULL }
+             };
+           size_t namlen = (5 + strlen (ni->library->name) + 1
+                            + strlen (fct_name) + 1);
+           char name[namlen];
+
+           /* Construct the function name.  */
+           __stpcpy (__stpcpy (__stpcpy (name, ni->library->name),
+                               "_"),
+                     fct_name);
+
+           result = NULL;
+           for (tp = &tbl[0]; tp->fname; tp++)
+             if (strcmp (tp->fname, name) == 0)
+               {
+                 result = tp->fp;
+                 break;
+               }
+         }
+#endif

 
          /* Remember function pointer for later calls.  Even if null, we
             record it so a second try needn't search the library again.  */
 
          /* Remember function pointer for later calls.  Even if null, we
             record it so a second try needn't search the library again.  */


@@ -386,6 +479,7 @@ nss_lookup_function (service_user *ni, const char *fct_name)
 
 
 static name_database *
 
 
 static name_database *

+internal_function

 nss_parse_file (const char *fname)
 {
   FILE *fp;
 nss_parse_file (const char *fname)
 {
   FILE *fp;


@@ -458,6 +552,7 @@ nss_parse_file (const char *fname)
        `( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
    */
 static service_user *
        `( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
    */
 static service_user *

+internal_function

 nss_parse_service_list (const char *line)
 {
   service_user *result = NULL, **nextp = &result;
 nss_parse_service_list (const char *line)
 {
   service_user *result = NULL, **nextp = &result;


@@ -492,8 +587,7 @@ nss_parse_service_list (const char *line)
              free (new_service);
              return result;
            }
              free (new_service);
              return result;
            }

-         memcpy (source, name, line - name);
-         source[line - name] = '\0';
+         *((char *) __mempcpy (source, name, line - name)) = '\0';

 
          new_service->name = source;
        }
 
          new_service->name = source;
        }


@@ -607,6 +701,7 @@ nss_parse_service_list (const char *line)
 }
 
 static name_database_entry *
 }
 
 static name_database_entry *

+internal_function

 nss_getline (char *line)
 {
   const char *name;
 nss_getline (char *line)
 {
   const char *name;


@@ -653,6 +748,7 @@ nss_getline (char *line)
 
 
 static service_library *
 
 
 static service_library *

+internal_function

 nss_new_service (name_database *database, const char *name)
 {
   service_library **currentp = &database->library;
 nss_new_service (name_database *database, const char *name)
 {
   service_library **currentp = &database->library;