Rollup merge of #21964 - semarie:openbsd-env, r=alexcrichton

[rust.git] / src / rt / rust_builtin.c

diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c
index 382cbf0d5d129e5849ca9714f809626ba6d4c5d4..b756602ead4f43286408ad769742f79e4fc32934 100644 (file)
--- a/src/rt/rust_builtin.c
+++ b/src/rt/rust_builtin.c
@@ -47,7 +47,8 @@ extern char **environ;
 #endif
 #endif
 
-#if defined(__FreeBSD__) || defined(__linux__) || defined(__ANDROID__) || defined(__DragonFly__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__linux__) || defined(__ANDROID__) \
+  || defined(__DragonFly__) || defined(__OpenBSD__)
 extern char **environ;
 #endif
 
@@ -204,7 +205,7 @@ int *__dfly_error(void) { return __error(); }
 #include <sys/sysctl.h>
 #include <limits.h>
 
-const char * rust_load_self() {
+const char * rust_current_exe() {
     static char *self = NULL;
 
     if (self == NULL) {
@@ -235,7 +236,7 @@ const char * rust_load_self() {
 
         /* get realpath if possible */
         if ((argv[0] != NULL) && ((*argv[0] == '.') || (*argv[0] == '/')
-                               || (strstr(argv[0], "/") != NULL)))
+                                || (strstr(argv[0], "/") != NULL)))
 
             self = realpath(argv[0], NULL);
         else