Support across the board

Author: adamziel

packages/php-wasm/compile/Dockerfile

@@ -709,6 +709,7 @@ RUN echo -n ' -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 ' >> /root/.emcc-php-w
 "ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMPVAR_CONST_HANDLER",\
 "ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMPVAR_HANDLER",\
 "cli",\
+"wasm_sleep",\
 "wasm_php_exec",\
 "wasm_sapi_handle_request",\
 "_call_user_function_ex",\
@@ -957,6 +958,7 @@ RUN source /root/emsdk/emsdk_env.sh && \
 "_phpwasm_destroy_uploaded_files_hash", \n\
 "_phpwasm_init_uploaded_files_hash", \n\
 "_phpwasm_register_uploaded_file", \n\
+"_emscripten_sleep", \n\
 "_wasm_sleep", \n\
 "_wasm_set_phpini_path", \n\
 "_wasm_set_phpini_entries", \n\

packages/php-wasm/compile/build-assets/proc_open7.0.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2018 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -15,13 +15,12 @@
    | Author: Wez Furlong <wez@thebrainroom.com>                           |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
 # define _BSD_SOURCE 		/* linux wants this when XOPEN mode is on */
-# define _BSD_COMPAT		/* irix: uint */
+# define _BSD_COMPAT		/* irix: uint32_t */
 # define _XOPEN_SOURCE 500  /* turn on Unix98 */
-# define __EXTENSIONS__	1	/* Solaris: uint */
+# define __EXTENSIONS__	1	/* Solaris: uint32_t */
 #endif
 
 #include "php.h"
@@ -36,11 +35,6 @@
 #include "SAPI.h"
 #include "main/php_network.h"
 
-#ifdef NETWARE
-#include <proc.h>
-#include <library.h>
-#endif
-
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
@@ -60,7 +54,6 @@
  * Other platforms may modify that configure check and add suitable #ifdefs
  * around the alternate code.
  * */
-
 #if 0 && HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H && HAVE_TERMIOS_H
 # include <sys/ioctl.h>
 # include <termios.h>
@@ -108,7 +101,11 @@ static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent
 		str = zval_get_string(element);
 
 		if (ZSTR_LEN(str) == 0) {
+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 3)
+			zend_string_release_ex(str, 0);
+#else
 			zend_string_release(str);
+#endif
 			continue;
 		}
 
@@ -147,10 +144,14 @@ static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent
 #endif
 			p += ZSTR_LEN(str) + 1;
 		}
-		zend_string_release(str);
+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 3)
+			zend_string_release_ex(str, 0);
+#else
+			zend_string_release(str);
+#endif
 	} ZEND_HASH_FOREACH_END();
 
-	assert((uint)(p - env.envp) <= sizeenv);
+	assert((uint32_t)(p - env.envp) <= sizeenv);
 
 	zend_hash_destroy(env_hash);
 	FREE_HASHTABLE(env_hash);
@@ -189,10 +190,10 @@ static void proc_open_rsrc_dtor(zend_resource *rsrc)
 	/* Close all handles to avoid a deadlock */
 	for (i = 0; i < proc->npipes; i++) {
 		if (proc->pipes[i] != 0) {
-#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION < 3)
-			GC_REFCOUNT(proc->pipes[i])--;
-#else
+#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 3)
 			GC_DELREF(proc->pipes[i]);
+#else
+			GC_REFCOUNT(proc->pipes[i])--;
 #endif
 			zend_list_close(proc->pipes[i]);
 			proc->pipes[i] = 0;
@@ -247,17 +248,19 @@ PHP_MINIT_FUNCTION(proc_open)
 }
 /* }}} */
 
-/* {{{ proto bool proc_terminate(resource process [, long signal])
+/* {{{ proto bool proc_terminate(resource process [, int signal])
    kill a process opened by proc_open */
 PHP_FUNCTION(proc_terminate)
 {
 	zval *zproc;
 	struct php_process_handle *proc;
 	zend_long sig_no = SIGTERM;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &zproc, &sig_no) == FAILURE) {
-		RETURN_FALSE;
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 2)
+		Z_PARAM_RESOURCE(zproc)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_LONG(sig_no)
+	ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
 	if ((proc = (struct php_process_handle *)zend_fetch_resource(Z_RES_P(zproc), "process", le_proc_open)) == NULL) {
 		RETURN_FALSE;
@@ -286,9 +289,9 @@ PHP_FUNCTION(proc_close)
 	zval *zproc;
 	struct php_process_handle *proc;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zproc) == FAILURE) {
-		RETURN_FALSE;
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_RESOURCE(zproc)
+	ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
 	if ((proc = (struct php_process_handle *)zend_fetch_resource(Z_RES_P(zproc), "process", le_proc_open)) == NULL) {
 		RETURN_FALSE;
@@ -316,9 +319,9 @@ PHP_FUNCTION(proc_get_status)
 	int running = 1, signaled = 0, stopped = 0;
 	int exitcode = -1, termsig = 0, stopsig = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zproc) == FAILURE) {
-		RETURN_FALSE;
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_RESOURCE(zproc)
+	ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
 	if ((proc = (struct php_process_handle *)zend_fetch_resource(Z_RES_P(zproc), "process", le_proc_open)) == NULL) {
 		RETURN_FALSE;
@@ -349,11 +352,8 @@ PHP_FUNCTION(proc_get_status)
 		if (WIFSIGNALED(wstatus)) {
 			running = 0;
 			signaled = 1;
-#ifdef NETWARE
-			termsig = WIFTERMSIG(wstatus);
-#else
+
 			termsig = WTERMSIG(wstatus);
-#endif
 		}
 		if (WIFSTOPPED(wstatus)) {
 			stopped = 1;
@@ -424,6 +424,7 @@ PHP_FUNCTION(proc_open)
 	php_process_env_t env;
 	int ndesc = 0;
 	int i;
+    int current_procopen_call_id = ++procopen_call_id;
 	zval *descitem = NULL;
 	zend_string *str_index;
 	zend_ulong nindex;
@@ -432,20 +433,14 @@ PHP_FUNCTION(proc_open)
 #ifdef PHP_WIN32
 	PROCESS_INFORMATION pi;
 	HANDLE childHandle;
-	STARTUPINFO si;
+	STARTUPINFOW si;
 	BOOL newprocok;
 	SECURITY_ATTRIBUTES security;
 	DWORD dwCreateFlags = 0;
-	char *command_with_cmd;
 	UINT old_error_mode;
 	char cur_cwd[MAXPATHLEN];
-#endif
-#ifdef NETWARE
-	char** child_argv = NULL;
-	char* command_dup = NULL;
-	char* orig_cwd = NULL;
-	int command_num_args = 0;
-	wiring_t channel;
+	wchar_t *cmdw = NULL, *cwdw = NULL, *envpw = NULL;
+	size_t tmp_len;
 #endif
 	php_process_id_t child;
 	struct php_process_handle *proc;
@@ -459,13 +454,16 @@ PHP_FUNCTION(proc_open)
 	php_file_descriptor_t dev_ptmx = -1;	/* master */
 	php_file_descriptor_t slave_pty = -1;
 #endif
- 
-    int current_procopen_call_id = ++procopen_call_id;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "saz/|s!a!a!", &command,
-				&command_len, &descriptorspec, &pipes, &cwd, &cwd_len, &environment,
-				&other_options) == FAILURE) {
-		RETURN_FALSE;
-	}
+
+	ZEND_PARSE_PARAMETERS_START(3, 6)
+		Z_PARAM_STRING(command, command_len)
+		Z_PARAM_ARRAY(descriptorspec)
+		Z_PARAM_ZVAL_DEREF(pipes)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STRING_EX(cwd, cwd_len, 1, 0)
+		Z_PARAM_ARRAY_EX(environment, 1, 0)
+		Z_PARAM_ARRAY_EX(other_options, 1, 0)
+	ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
 	command = pestrdup(command, is_persistent);
 
@@ -547,7 +545,7 @@ PHP_FUNCTION(proc_open)
 #else
 			descriptors[ndesc].childend = dup(fd);
 			if (descriptors[ndesc].childend < 0) {
-				php_error_docref(NULL, E_WARNING, "unable to dup File-Handle for descriptor %pd - %s", nindex, strerror(errno));
+				php_error_docref(NULL, E_WARNING, "unable to dup File-Handle for descriptor " ZEND_ULONG_FMT " - %s", nindex, strerror(errno));
 				goto exit_fail;
 			}
 #endif
@@ -592,15 +590,15 @@ PHP_FUNCTION(proc_open)
                     descriptors[ndesc].childend = current_procopen_call_id;
                     descriptors[ndesc].parentend = open(device_path, O_WRONLY);
                 } else {
-                    if (strncmp(Z_STRVAL_P(zmode), "w", 1) != 0) {
-                        descriptors[ndesc].parentend = newpipe[1];
-                        descriptors[ndesc].childend = newpipe[0];
-                        descriptors[ndesc].mode |= DESC_PARENT_MODE_WRITE;
-                    } else {
-                        descriptors[ndesc].parentend = newpipe[0];
-                        descriptors[ndesc].childend = newpipe[1];
-                    }
-                }
+					if (strncmp(Z_STRVAL_P(zmode), "w", 1) != 0) {
+						descriptors[ndesc].parentend = newpipe[1];
+						descriptors[ndesc].childend = newpipe[0];
+						descriptors[ndesc].mode |= DESC_PARENT_MODE_WRITE;
+					} else {
+						descriptors[ndesc].parentend = newpipe[0];
+						descriptors[ndesc].childend = newpipe[1];
+					}
+				}
 #ifdef PHP_WIN32
 				/* don't let the child inherit the parent side of the pipe */
 				descriptors[ndesc].parentend = dup_handle(descriptors[ndesc].parentend, FALSE, TRUE);
@@ -689,6 +687,7 @@ PHP_FUNCTION(proc_open)
 		ndesc++;
 	} ZEND_HASH_FOREACH_END();
 
+
     // the wasm way {{{
     js_open_process(
 		command, 
@@ -698,7 +697,7 @@ PHP_FUNCTION(proc_open)
 		descriptors[2].childend,
 		descriptors[2].parentend
 	);
-    // }}}
+	// }}}
 	/* we forked/spawned and this is the parent */
 
 	proc = (struct php_process_handle*)pemalloc(sizeof(struct php_process_handle), is_persistent);
@@ -712,10 +711,7 @@ PHP_FUNCTION(proc_open)
 #endif
 	proc->env = env;
 
-	if (pipes != NULL) {
-		zval_dtor(pipes);
-	}
-
+	zval_ptr_dtor(pipes);
 	array_init(pipes);
 
 #if PHP_CAN_DO_PTS
@@ -791,6 +787,11 @@ PHP_FUNCTION(proc_open)
 	efree(descriptors);
 	_php_free_envp(env, is_persistent);
 	pefree(command, is_persistent);
+#ifdef PHP_WIN32
+	free(cwdw);
+	free(cmdw);
+	free(envpw);
+#endif
 #if PHP_CAN_DO_PTS
 	if (dev_ptmx >= 0) {
 		close(dev_ptmx);
@@ -803,12 +804,3 @@ PHP_FUNCTION(proc_open)
 
 }
 /* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */