summaryrefslogtreecommitdiff
path: root/libexec/ld.so/library_mquery.c
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2016-03-20 02:29:52 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2016-03-20 02:29:52 +0000
commitd0e12fa98d7fe2416924163c37eb3591589f5dbc (patch)
tree267d32055866a0b456c2b96ed2874a7929e6888f /libexec/ld.so/library_mquery.c
parent85de4618d0fa9780c917d874510af87f46cc2dd7 (diff)
Export environ and __progname, making the latter a copy of just the filename
portion like crt0 does. This is prep for eliminating _dl_fixup_user_env() Mark almost everything in resolve.h as hidden, to improve code generation. ok kettenis@ mpi@ "good time" deraadt@
Diffstat (limited to 'libexec/ld.so/library_mquery.c')
-rw-r--r--libexec/ld.so/library_mquery.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libexec/ld.so/library_mquery.c b/libexec/ld.so/library_mquery.c
index 5868fbf2f00..48151f6d4fa 100644
--- a/libexec/ld.so/library_mquery.c
+++ b/libexec/ld.so/library_mquery.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: library_mquery.c,v 1.51 2015/12/22 08:54:16 mmcc Exp $ */
+/* $OpenBSD: library_mquery.c,v 1.52 2016/03/20 02:29:51 guenther Exp $ */
/*
* Copyright (c) 2002 Dale Rahn
@@ -206,7 +206,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags)
break;
case PT_TLS:
_dl_printf("%s: unsupported TLS program header in %s\n",
- _dl_progname, libname);
+ __progname, libname);
_dl_close(libfile);
_dl_errno = DL_CANT_LOAD_OBJ;
return(0);
@@ -314,8 +314,7 @@ retry:
}
return(object);
fail:
- _dl_printf("%s: rtld mmap failed mapping %s.\n",
- _dl_progname, libname);
+ _dl_printf("%s: rtld mmap failed mapping %s.\n", __progname, libname);
_dl_close(libfile);
_dl_errno = DL_CANT_MMAP;
_dl_load_list_free(lowld);