Simplify cli_main

ports/python-static/nacl.patch

Index: ports/python-static/nacl.patch
diff --git a/ports/python-static/nacl.patch b/ports/python-static/nacl.patch
index d48ae54fe586d5bdab9e72cf7db3b14364fe737e..e04a1e501323a7281f47adb3ba02a7e411839f10 100644
--- a/ports/python-static/nacl.patch
+++ b/ports/python-static/nacl.patch
@@ -423,7 +423,7 @@ diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
 diff --git a/Modules/python.c b/Modules/python.c
 --- a/Modules/python.c
 +++ b/Modules/python.c
-@@ -6,6 +6,36 @@
+@@ -6,6 +6,20 @@
  #include <floatingpoint.h>
  #endif
  
@@ -432,16 +432,6 @@ diff --git a/Modules/python.c b/Modules/python.c
 +#include <stdio.h>
 +#include <sys/utsname.h>
 +
-+// Stubs for functions implemented through PPAPI.
-+int spawnv(int mode, const char* path, char *const argv[]) {
-+  return 0;
-+}
-+
-+int spawnve(int mode, const char* path,
-+            char *const argv[], char *const envp[]) {
-+  return 0;
-+}
-+

[Sam Clegg, 2015/02/13 18:35:18]

So these are not longer needed because libnacl-spawn is always linked now, even
for the sel_ldr binary?

If that is true then is nacl_io also always linked?  If so we can remove the
uname below too maybe?

[gdeepti, 2015/02/13 21:43:56]

Done.

[gdeepti, 2015/02/13 21:43:56]

Good point, removed uname as well. 

 +// Dummy implementation of uname.  This is only needed for the sel_ldr
 +// version of python.  Otherwise it gets provided by nacl_io.
 +int uname(struct utsname *buf)
@@ -451,16 +441,10 @@ diff --git a/Modules/python.c b/Modules/python.c
 +}
 +#endif
 +
-+// Dummy implementation of nacl_spawn_vfork_exit, otherwise provided
-+// by nacl_spawn.
-+void nacl_spawn_vfork_exit(int status) {
-+  _exit(status);
-+}
-+
  int
  main(int argc, char **argv)
  {
-@@ -20,5 +44,9 @@ main(int argc, char **argv)
+@@ -20,5 +34,9 @@ main(int argc, char **argv)
  	m = fpgetmask();
  	fpsetmask(m & ~FP_X_OFL);
  #endif