--- parser3/src/main/pa_exec.C	2003/07/22 08:19:58	1.48.2.18.2.17
+++ parser3/src/main/pa_exec.C	2004/05/25 06:20:48	1.59
@@ -1,13 +1,13 @@
 /** @file
 	Parser: program executing for different OS-es.
 
-	Copyright(c) 2000,2001-2003 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright(c) 2000,2001-2004 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 	@todo setrlimit
 */
 
-static const char* IDENT_EXEC_C="$Date: 2003/07/22 08:19:58 $";
+static const char * const IDENT_EXEC_C="$Date: 2004/05/25 06:20:48 $";
 
 #include "pa_config_includes.h"
 
@@ -271,7 +271,9 @@ static pid_t execve_piped(const char* fi
 
 static int get_exit_status(int pid) {
 	int status;
-	if(!waitpid(pid, &status, 0))
+	pid_t cid;
+	while ((cid=waitpid(pid, &status, WUNTRACED)) == -1 && errno == EINTR);	
+	if(!cid)
 		return -1;
 	return WIFEXITED(status) ? 
 		WEXITSTATUS(status) : -2;
@@ -307,7 +309,7 @@ static void append_env_pair(HashStringSt
 	info->string << key << "=" << value;
 	info->string.append_know_length("\1", 1, String::L_AS_IS); // placeholder for of zero byte
 #else
-	StringBody body;
+	String::Body body;
 	body << key << "=" << value;
 
 	*(info->env_ref++)=body.cstrm();
@@ -316,7 +318,11 @@ static void append_env_pair(HashStringSt
 
 /// @todonow unix part to smart_ptr
 PA_exec_result pa_exec(
-			bool forced_allow, 
+			bool 
+#if defined(NO_PA_EXEC) || defined(PA_SAFE_MODE)
+			forced_allow
+#endif
+			, 
 			const String& file_spec, 
 			const HashStringString* env, 
 			const ArrayString& argv, 
@@ -330,14 +336,12 @@ PA_exec_result pa_exec(
 			"parser execs are disabled [recompile parser without --disable-execs configure option]");
 #endif
 
-	// execve needs non const
-	char* file_spec_cstr=file_spec.cstrm(String::L_FILE_SPEC); 
 #ifdef WIN32
 
 	PROCESS_INFORMATION pi;	
 	HANDLE hInWrite, hOutRead, hErrRead;
 	const char* cmd=buildCommand(file_spec.cstr(String::L_FILE_SPEC), argv);
-	char* env_cstr;
+	char* env_cstr=0;
 	if(env) {
 		String string;
 		Append_env_pair_info info(string);
@@ -359,8 +363,8 @@ PA_exec_result pa_exec(
             
 		throw Exception(0,
 			&file_spec,
-			"exec failed - %s (%ld). Consider adding shbang line (#!x:\\interpreter\\command line)", 
-				error_size?szErrorDesc:"<unknown>", (long)error);
+			"exec failed - %s (%u). Consider adding shbang line (#!x:\\interpreter\\command line)", 
+				error_size?szErrorDesc:"<unknown>", error);
 	} else {
 		const char* in_cstr=in.cstr();
 		DWORD written_size;
@@ -386,6 +390,9 @@ from http://www.apache.org/websrc/cvsweb
 
 #else
 
+	// execve needs non const
+	char* file_spec_cstr=file_spec.cstrm(String::L_FILE_SPEC); 
+
 	int pipe_write, pipe_read, pipe_err;
 
 #ifdef PA_SAFE_MODE
@@ -438,10 +445,12 @@ from http://www.apache.org/websrc/cvsweb
 		close(pipe_err);
 
 		result.status=get_exit_status(pid); // negative may mean "-errno[execl()]"
-	} else 
+	} else { 
+		const char* str=strerror(errno);
 		throw Exception(0,
 			&file_spec,
-			"%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); 
+			"%s error: %s (%d)", pid<0?"fork":"pipe", str?str:"<unknown>", errno); 
+	}
 #endif
 
 	return result;