--- parser3/src/main/pa_exec.C	2002/02/05 15:38:57	1.23
+++ parser3/src/main/pa_exec.C	2002/03/22 14:30:07	1.30
@@ -1,10 +1,10 @@
 /** @file
 	Parser: program executing for different OS-es.
 
-	Copyright(c) 2000,2001 ArtLebedev Group(http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>(http://paf.design.ru)
+	Copyright(c) 2000,2001, 2002 ArtLebedev Group(http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_exec.C,v 1.23 2002/02/05 15:38:57 paf Exp $
+	$Id: pa_exec.C,v 1.30 2002/03/22 14:30:07 paf Exp $
 
 
 	@todo setrlimit
@@ -27,7 +27,7 @@
 #ifdef WIN32
 
 /// this func from http://www.ccas.ru/~posp/popov/spawn.htm
-static BOOL WINAPI CreateHiddenConsoleProcess(LPCTSTR szChildName,
+static BOOL WINAPI CreateHiddenConsoleProcess(LPCTSTR szCmdLine,
 										char *szEnv,
                                         PROCESS_INFORMATION* ppi, 
                                         LPHANDLE phInWrite,
@@ -72,11 +72,11 @@ static BOOL WINAPI CreateHiddenConsolePr
 
     // Create a child process (suspended)
     fCreated=CreateProcess(NULL,
-                              (LPTSTR)szChildName,
+                              (LPTSTR)szCmdLine,
                               NULL,
                               NULL,
                               TRUE,
-                              0, //todo CREATE_NO_WINDOW,
+                              CREATE_NO_WINDOW,
                               szEnv,
                               NULL,
                               &si,
@@ -103,8 +103,7 @@ static void read_pipe(String& result, HA
 	while(true) {
 		char *buf=(char *)result.pool().malloc(MAX_STRING);
 		unsigned long size;
-		ReadFile(hOutRead, buf, MAX_STRING, &size, NULL);
-		if(!size) 
+		if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) 
 			break;
 		result.APPEND_AS_IS(buf, size, file_spec, 0);
     }
@@ -154,14 +153,9 @@ static const char *buildCommand(Pool& po
 
 #else
 
-static int execle_piped(const char *path, 
-						const char *arg1, const char *arg2,
-						const char *arg3, const char *arg4,
-						const char *arg5, const char *arg6,
-						const char *arg7, const char *arg8,
-						const char *arg9, const char *arg10,
-						char * const env[],
-						int *pipe_in, int *pipe_out, int *pipe_err) {
+static int execve_piped(const char *path, 
+			char * const argv[], char * const env[],
+			int *pipe_in, int *pipe_out, int *pipe_err) {
 	int pid;
 	int in_fds[2];
 	int out_fds[2];
@@ -234,7 +228,7 @@ static int execle_piped(const char *path
 		/* HP-UX SIGCHLD fix goes here, if someone will remind me what it is... */
 		signal(SIGCHLD, SIG_DFL);	/* Was that it? */
 	
-		execle(path, path, arg1, arg2, arg3, arg4, arg5, NULL, env);
+		execve(path, argv, env);
 		exit(-errno);
 	}
 	
@@ -270,7 +264,7 @@ static void read_pipe(String& result, in
 	while(true) {
 		char *buf=(char *)result.pool().malloc(MAX_STRING);
 		size_t size=read(file, buf, MAX_STRING);
-		if(!size) 
+		if(!size)
 			break;
 		result.APPEND_AS_IS(buf, size, file_spec, 0);
     }
@@ -278,6 +272,7 @@ static void read_pipe(String& result, in
 
 #endif
 
+///@test maybe here and at argv construction --- cstr(String::UL_UNSPECIFIED
 static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) {
 #ifdef WIN32
 	String& string=*static_cast<String *>(info);
@@ -292,12 +287,25 @@ static void append_env_pair(const Hash::
 	**env_ref=string.cstr();  (*env_ref)++;
 #endif
 }
+/**
+	@test thread safety: SetCurrentDirectory works per-process, not .
+	there's a field in createprocess, which is.
+	@test thread safety: on unix we sould change dir after fork!
+*/
 int pa_exec(const String& file_spec, 
 			const Hash *env,
 			const Array *argv,
 			const String& in, String& out, String& err) {
 	Pool& pool=file_spec.pool();
 
+#ifdef NO_PA_EXECS
+
+	throw Exception(0, 0,
+		&file_spec,
+		"parser execs are disabled [recompile parser without --disable-execs configure option]");
+
+#else
+
 #ifdef WIN32
 
 	char pwd[MAX_STRING];
@@ -352,7 +360,7 @@ from http://www.apache.org/websrc/cvsweb
             
 		throw Exception(0, 0,
 			&file_spec,
-			"(real filename=\"%s\") exec failed - %s (%ld)",
+			"(real command line=\"%s\") exec failed - %s (%ld)",
 				cmd,
 				szErrorDesc, (long)error);
 	}
@@ -360,21 +368,19 @@ from http://www.apache.org/websrc/cvsweb
 #else
 
 	int pipe_write, pipe_read, pipe_err;
-	const char *argv_cstrs[10]={
-		"", "", "", "", "", 
-		"", "", "", "", ""
-	};
+	char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC);
+	char *argv_cstrs[1+10+1]={file_spec_cstr, 0};
 	if(argv) {
 		const int argv_size=argv->size();
-		const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0]);
+		const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0])-1-1;
 		if(argv_size>argv_max)
 			throw Exception(0, 0,
 				&file_spec,
 				"too many arguments (%d > max %d)", argv_size, argv_max);
 		for(int i=0; i<argv_size; i++)
-			argv_cstrs[i]=argv->get_string(i)->cstr();
+			argv_cstrs[1+i]=argv->get_string(i)->cstr();
+		argv_cstrs[1+argv_size]=0;
 	}
-	const char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC);
 	char **env_cstrs=0;
 	if(env) {
 		env_cstrs=
@@ -388,11 +394,9 @@ from http://www.apache.org/websrc/cvsweb
 	strncpy(dir, file_spec_cstr, MAX_STRING);
 	rsplit(dir,'/'); // trim filename
     chdir(dir);
-	int pid=execle_piped(
+	int pid=execve_piped(
 		file_spec_cstr,
-		argv_cstrs[0], argv_cstrs[1], argv_cstrs[2], argv_cstrs[3], argv_cstrs[4],
-		argv_cstrs[5], argv_cstrs[6], argv_cstrs[7], argv_cstrs[8], argv_cstrs[9],
-		env_cstrs,
+		argv_cstrs, env_cstrs,
 		&pipe_write, &pipe_read, &pipe_err);
     if (pwd) 
 		chdir(pwd);
@@ -412,6 +416,7 @@ from http://www.apache.org/websrc/cvsweb
 			&file_spec,
 			"pipe error");
 #endif
+#endif
 
 	return 0;
 }