From 8813c956e506d57065b7089a98c8fcef1ef58c47 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 25 Jun 2013 21:39:35 -0400 Subject: [PATCH] make newline-delimited dynamic linker path file actually work apparently the original commit was never tested properly, since getline was only ever reading one line. the intent was to read the entire file, so use getdelim with the null byte as delimiter as a cheap way to read a whole file into memory. --- src/ldso/dynlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index ee5ec302..8472343a 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -478,7 +478,7 @@ 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) { + if (getdelim(&sys_path, (size_t[1]){0}, 0, f) > 0) { size_t l = strlen(sys_path); if (l && sys_path[l-1]=='\n') sys_path[l-1] = 0; -- 2.20.1