X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=935367e330d65ebe8756218ac3225c8ab36af130;hb=5652d70054daf3c2c9b6d475fdf9d24a940e51aa;hp=625f80cca6eb38ca86452713920b2de229ee71a4;hpb=2f2f115b58269468304d2f26d029eb470fb44b4a;p=musl

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 625f80cc..935367e3 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -433,7 +433,7 @@ static struct dso *load_library(const char *name)
 {
 	char buf[2*NAME_MAX+2];
 	const char *pathname;
-	unsigned char *base, *map;
+	unsigned char *map;
 	size_t map_len;
 	struct dso *p, temp_dso = {0};
 	int fd;
@@ -478,13 +478,16 @@ static struct dso *load_library(const char *name)
 			if (!sys_path) {
 				FILE *f = fopen(ETC_LDSO_PATH, "rbe");
 				if (f) {
-					if (getline(&sys_path, (size_t[1]){0}, f) > 0)
-						sys_path[strlen(sys_path)-1]=0;
+					if (getline(&sys_path, (size_t[1]){0}, f) > 0) {
+						size_t l = strlen(sys_path);
+						if (l && sys_path[l-1]=='\n')
+							sys_path[l-1] = 0;
+					}
 					fclose(f);
 				}
 			}
-			if (sys_path) fd = path_open(name, sys_path, buf, sizeof buf);
-			else fd = path_open(name, "/lib:/usr/local/lib:/usr/lib", buf, sizeof buf);
+			if (!sys_path) sys_path = "/lib:/usr/local/lib:/usr/lib";
+			fd = path_open(name, sys_path, buf, sizeof buf);
 		}
 		pathname = buf;
 	}
@@ -563,7 +566,7 @@ static struct dso *load_library(const char *name)
 	p->prev = tail;
 	tail = p;
 
-	if (ldd_mode) dprintf(1, "\t%s => %s (%p)\n", name, pathname, base);
+	if (ldd_mode) dprintf(1, "\t%s => %s (%p)\n", name, pathname, p->base);
 
 	return p;
 }
@@ -924,7 +927,8 @@ void *__dynlink(int argc, char **argv)
 			if (phdr->p_type == PT_LOAD)
 				vdso->base = (void *)(vdso_base - phdr->p_vaddr + phdr->p_offset);
 		}
-		vdso->name = vdso->shortname = "linux-gate.so.1";
+		vdso->name = "";
+		vdso->shortname = "linux-gate.so.1";
 		vdso->global = 1;
 		decode_dyn(vdso);
 		vdso->prev = lib;
@@ -995,13 +999,16 @@ void *__dynlink(int argc, char **argv)
 
 	if (ssp_used) __init_ssp((void *)aux[AT_RANDOM]);
 
-	atexit(do_fini);
-	do_init_fini(tail);
-
 	errno = 0;
 	return (void *)aux[AT_ENTRY];
 }
 
+void __init_ldso_ctors(void)
+{
+	atexit(do_fini);
+	do_init_fini(tail);
+}
+
 void *dlopen(const char *file, int mode)
 {
 	struct dso *volatile p, *orig_tail, *next;