diff options
author | Rich Felker <dalias@aerifal.cx> | 2012-11-09 13:49:40 -0500 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2012-11-09 13:49:40 -0500 |
commit | 65465101ee23447bf30adc3a9ebf817d58f5d956 (patch) | |
tree | d473d793b9852d97e61c6a980c96441cd0b12233 /src | |
parent | 40d5f7eb8323bcc36344424023b82603fa04cb93 (diff) | |
download | musl-65465101ee23447bf30adc3a9ebf817d58f5d956.tar.gz musl-65465101ee23447bf30adc3a9ebf817d58f5d956.tar.bz2 musl-65465101ee23447bf30adc3a9ebf817d58f5d956.tar.xz musl-65465101ee23447bf30adc3a9ebf817d58f5d956.zip |
support ldso path files without final newline
Diffstat (limited to 'src')
-rw-r--r-- | src/ldso/dynlink.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index c295301f..ba2f6129 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -478,8 +478,11 @@ 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[-1] = 0; + } fclose(f); } } |