* inet/getrpcent.c: Fix macros.
* inet/getrpcent_r.c: Fix macros.
* elf/dlsym.c (dlsym): Search the global scope if HANDLE is null.
* elf/dl-load.c (_dl_map_object_from_fd): Initialize L.
+Tue Jun 25 10:58:23 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+
+ * inet/getrpcent.c: Fix macros.
+ * inet/getrpcent_r.c: Fix macros.
+
+ * elf/dlsym.c (dlsym): Search the global scope if HANDLE is null.
+
+ * elf/dl-load.c (_dl_map_object_from_fd): Initialize L.
+
Tue Jun 25 09:55:47 1996 David Mosberger-Tang <davidm@AZStarNet.com>
* catgets/gencat.c (write_out): Use %Zu to print variables of type
_dl_map_object_from_fd (const char *name, int fd, char *realname,
struct link_map *loader, int l_type)
{
- struct link_map *l;
+ struct link_map *l = NULL;
void *file_mapping = NULL;
size_t mapping_size = 0;
void *
dlsym (void *handle, const char *name)
{
- struct link_map *map = handle;
ElfW(Addr) loadbase;
const ElfW(Sym) *ref = NULL;
void doit (void)
{
- struct link_map *scope[2] = { map, NULL };
- loadbase = _dl_lookup_symbol (name, &ref, scope, map->l_name, 0, 0);
+ struct link_map *map = handle, **scope, *mapscope[2] = { map, NULL };
+ const char *owner;
+
+ if (map)
+ {
+ /* Search the scope of the given object. */
+ scope = mapscope;
+ owner = map->l_name;
+ }
+ else
+ {
+ scope = &(_dl_global_scope ?: _dl_default_scope)[2];
+ owner = NULL;
+ }
+ loadbase = _dl_lookup_symbol (name, &ref, scope, owner, 0, 0);
}
return _dlerror_run (doit) ? NULL : (void *) (loadbase + ref->st_value);
#define LOOKUP_TYPE struct rpcent
-#define GETFUNC_NAME rpcent
+#define GETFUNC_NAME getrpcent
#define BUFLEN 1024
#include "../nss/getXXent.c"
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <rpc/netdb.h>
+#include <netdb.h>
-#define DATABASE_NAME rpc
#define LOOKUP_TYPE struct rpcent
-#define GETFUNC_NAME rpcent
-#define BUFLEN 1024
+#define SETFUNC_NAME setrpcent
+#define GETFUNC_NAME getrpcent
+#define ENDFUNC_NAME endrpcent
+#define DATABASE_NAME rpc
+#define STAYOPEN int stayopen
+#define STAYOPEN_VAR stayopen
#include "../nss/getXXent_r.c"