aboutsummaryrefslogtreecommitdiff
path: root/libc/bionic/__bionic_get_shell_path.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-03-21 21:11:41 -0700
committerElliott Hughes <enh@google.com>2019-03-25 17:28:22 -0700
commit886370c2402e6fcf6ac613a8603f99fff66cd20c (patch)
tree55973f92a11704c20bc09aa8a74c2094c7b1c2a7 /libc/bionic/__bionic_get_shell_path.cpp
parentebdf4c19f9e034d7ec8e0e57539890d5c93eaed1 (diff)
Fix internal uses of _PATH_BSHELL.
We regressed on this recently: code under the upstream-* directories has _PATH_BSHELL defined as a call to __bionic_get_shell_path(). In our own code, we may as well just call it directly. Bug: https://issuetracker.google.com/129030706 Test: ran tests Change-Id: Ic2423f521272be95e67f94771772fe8072636ef0
Diffstat (limited to 'libc/bionic/__bionic_get_shell_path.cpp')
-rw-r--r--libc/bionic/__bionic_get_shell_path.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/bionic/__bionic_get_shell_path.cpp b/libc/bionic/__bionic_get_shell_path.cpp
index 135281578..7aeed182e 100644
--- a/libc/bionic/__bionic_get_shell_path.cpp
+++ b/libc/bionic/__bionic_get_shell_path.cpp
@@ -26,6 +26,8 @@
* SUCH DAMAGE.
*/
+#include "private/__bionic_get_shell_path.h"
+
#include <errno.h>
#include <string.h>
#include <sys/cdefs.h>
@@ -51,7 +53,7 @@ static const char* init_sh_path() {
return "/system/bin/sh";
}
-__LIBC_HIDDEN__ extern "C" const char* __bionic_get_shell_path() {
+const char* __bionic_get_shell_path() {
static const char* sh_path = init_sh_path();
return sh_path;
}