getenv for Mac

tyfkda · Jun 28, 2024 · 6c6d0b4 · 6c6d0b4
1 parent 1de09bb
commit 6c6d0b4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/libsrc/crt0/_start.c b/libsrc/crt0/_start.c
@@ -4,8 +4,6 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-extern char **environ;
-
 #if defined(__linux__)
 
 #include "stdio.h"  // fflush
@@ -28,7 +26,10 @@ static void _atexit_proc(void) {
 
 static void start2(int argc, char *argv[], char *env[]) {
   extern int main(int, char**, char **);
+#ifndef __APPLE__
+  extern char **environ;
   environ = env;
+#endif
   atexit(_atexit_proc);
   int ec = main(argc, argv, env);
   exit(ec);

diff --git a/libsrc/stdlib/getenv.c b/libsrc/stdlib/getenv.c
@@ -1,9 +1,14 @@
 #include "stdlib.h"
 #include "string.h"
 
-extern char **environ;
-
 char *getenv(const char *varname) {
+#ifdef __APPLE__
+  extern char ***_NSGetEnviron(void);
+  char **environ = *_NSGetEnviron();
+#else
+  extern char **environ;
+#endif
+
   if (environ != NULL) {
     size_t len = strlen(varname);
     for (char **pp = environ, *p; (p = *pp++) != NULL;)

diff --git a/libsrc/unistd/execvp.c b/libsrc/unistd/execvp.c
@@ -1,7 +1,12 @@
 #include "unistd.h"
 
-extern char **environ;
-
 int execvp(const char *path, char *const args[]) {
+#ifdef __APPLE__
+  extern char ***_NSGetEnviron(void);
+  char **environ = *_NSGetEnviron();
+#else
+  extern char **environ;
+#endif
+
   return execve(path, args, environ);
 }