hyanantha Fri Jul 1 01:53:06 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard proc_open.c
Log:
As fork implementation of NetWare LibC still in experimental stages making
the procve based solution ahead of HAVE_FORK. Later When fork becomes stable
will revert this fix.
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.28.2.4&r2=1.28.2.5&ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.28.2.4
php-src/ext/standard/proc_open.c:1.28.2.5
--- php-src/ext/standard/proc_open.c:1.28.2.4 Thu Apr 7 19:08:48 2005
+++ php-src/ext/standard/proc_open.c Fri Jul 1 01:53:06 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.28.2.4 2005/04/07 23:08:48 iliaa Exp $ */
+/* $Id: proc_open.c,v 1.28.2.5 2005/07/01 05:53:06 hyanantha Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -35,6 +35,11 @@
#include "php_globals.h"
#include "SAPI.h"
+#ifdef NETWARE
+#include <proc.h>
+#include <library.h>
+#endif
+
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
@@ -486,6 +491,13 @@
char *command_with_cmd;
UINT old_error_mode;
#endif
+#ifdef NETWARE
+ char** child_argv = NULL;
+ char* command_dup = NULL;
+ char* orig_cwd = NULL;
+ int command_num_args = 0;
+ wiring_t channel;
+#endif
php_process_id_t child;
struct php_process_handle *proc;
int is_persistent = 0; /* TODO: ensure that persistent procs will work
*/
@@ -749,6 +761,46 @@
child = pi.hProcess;
CloseHandle(pi.hThread);
+#elif defined(NETWARE)
+ if (cwd) {
+ orig_cwd = getcwd(NULL, PATH_MAX);
+ chdir2(cwd);
+ }
+ channel.infd = descriptors[0].childend;
+ channel.outfd = descriptors[1].childend;
+ channel.errfd = -1;
+ /* Duplicate the command as processing downwards will modify it*/
+ command_dup = strdup(command);
+ /* get a number of args */
+ construct_argc_argv(command_dup, NULL, &command_num_args, NULL);
+ child_argv = (char**) malloc((command_num_args + 1) * sizeof(char*));
+ if(!child_argv) {
+ free(command_dup);
+ if (cwd && orig_cwd) {
+ chdir2(orig_cwd);
+ free(orig_cwd);
+ }
+ }
+ /* fill the child arg vector */
+ construct_argc_argv(command_dup, NULL, &command_num_args, child_argv);
+ child_argv[command_num_args] = NULL;
+ child = procve(child_argv[0], PROC_DETACHED|PROC_INHERIT_CWD, NULL,
&channel, NULL, NULL, 0, NULL, (const char**)child_argv);
+ free(child_argv);
+ free(command_dup);
+ if (cwd && orig_cwd) {
+ chdir2(orig_cwd);
+ free(orig_cwd);
+ }
+ if (child < 0) {
+ /* failed to fork() */
+ /* clean up all the descriptors */
+ for (i = 0; i < ndesc; i++) {
+ close(descriptors[i].childend);
+ close(descriptors[i].parentend);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "procve failed -
%s", strerror(errno));
+ goto exit_fail;
+ }
#elif HAVE_FORK
/* the unix way */
child = fork();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
