Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Aug 2021 09:21:57 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 2b5ccf507a7f - stable/13 - rtld: provide private getenv(3)
Message-ID:  <202108230921.17N9LvrH067235@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b5ccf507a7f7157dc28cf132fe48ec404ff3d5b

commit 2b5ccf507a7f7157dc28cf132fe48ec404ff3d5b
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-08-16 14:02:48 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-08-23 09:20:56 +0000

    rtld: provide private getenv(3)
    
    (cherry picked from commit b4b274889145bbc559613b54e7520b95f43e51e6)
---
 libexec/rtld-elf/rtld-libc/Makefile.inc | 2 +-
 libexec/rtld-elf/rtld.c                 | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc
index 94d6cbb5b39f..e3c7ee8ca5cf 100644
--- a/libexec/rtld-elf/rtld-libc/Makefile.inc
+++ b/libexec/rtld-elf/rtld-libc/Makefile.inc
@@ -27,7 +27,7 @@ SRCS+=	rtld_libc.c
 
 # Now build the remaining files from libc:
 .PATH: ${LIBC_SRCTOP}/stdlib
-SRCS+=	reallocf.c realpath.c getenv.c merge.c reallocarray.c
+SRCS+=	reallocf.c realpath.c merge.c reallocarray.c
 # TODO: fix merge.c to build with WARNS=6
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS.merge.c+=-Wno-error=null-pointer-arithmetic
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 39c41fe0ed24..8fb99246a4c1 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -6027,6 +6027,12 @@ rtld_strerror(int errnum)
 	return (sys_errlist[errnum]);
 }
 
+char *
+getenv(const char *name)
+{
+	return (rtld_get_env_val(environ, name, strlen(name)));
+}
+
 /* malloc */
 void *
 malloc(size_t nbytes)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108230921.17N9LvrH067235>