Simplify cli_main

ports/nacl-spawn/include/nacl_main.h

Index: ports/nacl-spawn/include/nacl_main.h
diff --git a/ports/nacl-spawn/include/nacl_main.h b/ports/nacl-spawn/include/nacl_main.h
index bb936f503f14a97a8c907641458253ec11b96f6d..7a7818a6165c479e9454a35b3a837bd534013869 100644
--- a/ports/nacl-spawn/include/nacl_main.h
+++ b/ports/nacl-spawn/include/nacl_main.h
@@ -22,7 +22,8 @@ __BEGIN_DECLS
 /*
  * Entry point expected by libcli_main.a
  */
-extern int nacl_main(int argc, char* argv[]);
+extern int nacl_main(int argc, char* argv[])
+    __attribute__ ((visibility ("default")));
 
 /*
  * Untar a startup bundle to a particular root.
@@ -36,6 +37,12 @@ extern int nacl_main(int argc, char* argv[]);
 extern int nacl_startup_untar(
     const char* argv0, const char* tarfile, const char* root);
 
+/*
+ * Setup common environment variables and mounts.
+ */
+
+extern void nacl_setup_env();
+
 __END_DECLS
 
 #endif /* NACL_SPAWN_NACL_MAIN_H_ */