Simplify cli_main

ports/python-static/nacl.patch

 diff --git a/Include/datetime.h b/Include/datetime.h
 --- a/Include/datetime.h
 +++ b/Include/datetime.h
 @@ -166,6 +166,8 @@ typedef struct {
  
  #ifdef Py_BUILD_CORE
  
 +#define PyDataTime_STATIC 1
 +
  /* Macros for type checking when building the Python core. */
@@ skipping 405 matching lines @@
 +}
 +#define getpwuid my_getpwuid
 +#endif
 +
  PyDoc_STRVAR(pwd_getpwuid__doc__,
  "getpwuid(uid) -> (pw_name,pw_passwd,pw_uid,\n\
                    pw_gid,pw_gecos,pw_dir,pw_shell)\n\
 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
  
 +#ifdef __native_client__
 +#define main nacl_main
 +#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)
 +{
 +       sprintf(buf->sysname, "NaCl");
 +       return 0;
 +}
 +#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
 +#ifdef __native_client__
 +       setvbuf(stdout, NULL, _IOLBF, 0);
 +       setvbuf(stdin, NULL, _IOLBF, 0);
 +#endif
         return Py_Main(argc, argv);
  }
 diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ skipping 258 matching lines @@
         OpenUNIX*|UnixWare*)
 @@ -2121,7 +2140,7 @@ then
             LINKFORSHARED="-Wl,-E -Wl,+s";;
  #          LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
         BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
 -       Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
 +       Linux*|GNU*|NaCl*) LINKFORSHARED="-Xlinker -export-dynamic";;
         # -u libsys_s pulls in all symbols in libsys
         Darwin/*) 
                 # -u _PyMac_Error is needed to pull in the mac toolbox glue,