Fixes the setproctitle bug, and the wheel bug.

dvarrazzo · Mar 10, 2020 · fb4641d · fb4641d
1 parent 9bd5646
commit fb4641d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/spt_python.h b/src/spt_python.h
@@ -14,9 +14,7 @@
 #include <Python.h>
 
 /* Things change a lot here... */
-#if PY_MAJOR_VERSION >= 3
 #define IS_PY3K
-#endif
 
 /* Detect pypy */
 #ifdef PYPY_VERSION

diff --git a/src/spt_setup.c b/src/spt_setup.c
@@ -344,6 +344,14 @@ get_args_from_proc(int *argc_o, char **arg0_o)
     return rv;
 }
 
+static int getargcargv(int* argc, char*** argv) {
+#ifdef __APPLE__
+
+  return 0;
+#endif
+  return -1;
+}
+
 /* Find the original arg buffer, return 0 if found, else -1.
  *
  * If found, set argc to the number of arguments, argv to an array
@@ -369,8 +377,10 @@ get_argc_argv(int *argc_o, char ***argv_o)
     int rv = -1;
 
 #ifndef IS_PYPY
+#ifndef __APPLE__
     spt_debug("reading argc/argv from Python main");
     Py_GetArgcArgv(&argc, &argv_py);
+#endif
 #endif
 
     if (argc > 0) {
@@ -397,8 +407,18 @@ get_argc_argv(int *argc_o, char ***argv_o)
         /* get a copy of argv[0] from /proc, so we get back in the same
          * situation of Py3 */
         if (0 > get_args_from_proc(&argc, &arg0)) {
+            spt_debug("reading argc/argv from Python main");
+#ifdef __APPLE__
+            argv = *_NSGetArgv();
+            argc = *_NSGetArgc();
+            if (argc == 0) {
+                spt_debug("failed to get args from proc fs");
+                goto exit;
+            }
+#else
             spt_debug("failed to get args from proc fs");
             goto exit;
+#endif
         }
     }
 
@@ -447,7 +467,7 @@ spt_setup(void)
 #ifndef WIN32
     int argc = 0;
     char **argv = NULL;
-    char *init_title;
+    char *init_title = "chia";
 
     if (0 > get_argc_argv(&argc, &argv)) {
         spt_debug("get_argc_argv failed");