--- parser3/src/main/pa_exec.C	2003/07/22 08:19:58	1.48.2.18.2.17
+++ parser3/src/main/pa_exec.C	2005/08/05 13:03:01	1.65.8.1
@@ -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-2005 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: 2005/08/05 13:03:01 $";
 
 #include "pa_config_includes.h"
 
@@ -27,6 +27,7 @@ static const char* IDENT_EXEC_C="$Date:
 
 /// this func from http://www.ccas.ru/~posp/popov/spawn.htm
 static DWORD CreateHiddenConsoleProcess(LPCTSTR szCmdLine,
+										LPCTSTR szScriptFileSpec,
 										char *szEnv,
                                         PROCESS_INFORMATION* ppi, 
                                         LPHANDLE phInWrite,
@@ -72,10 +73,9 @@ static DWORD CreateHiddenConsoleProcess(
 	
 	// calculating script's directory
 	char dir[MAX_STRING];
-	strncpy(dir, szCmdLine, MAX_STRING-1); dir[MAX_STRING-1]=0;
+	strncpy(dir, szScriptFileSpec, MAX_STRING-1); dir[MAX_STRING-1]=0;
 	lsplit(dir,' '); // trim arguments
 	rsplit(dir,'/'); rsplit(dir,'\\'); // trim filename
-	chdir(dir);
 	
 	// Create a child process (suspended)
 	fCreated=CreateProcess(NULL,
@@ -132,7 +132,7 @@ static const char* buildCommand(const ch
 			buf[size]=0;
 			if(strncmp(buf, "#!", 2)==0) {
 				const char* begin=buf+2;
-				if(*begin==' ') // alx: were an old magic for some linux-es
+				while(*begin==' ') // alx: were an old magic for some linux-es
 					begin++;
 				if(char *end=strchr(begin, '\n')) {
 					String string(pa_strdup(begin, end-begin));
@@ -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;
@@ -293,8 +295,8 @@ static void read_pipe(String& result, in
 #ifndef DOXYGEN
 struct Append_env_pair_info {
 #ifdef WIN32
-	String& string;
-	Append_env_pair_info(String& astring): string(astring) {}
+	String::Body& body;
+	Append_env_pair_info(String::Body& abody): body(abody) {}
 #else
 	char **env_ref;
 #endif
@@ -304,19 +306,22 @@ struct Append_env_pair_info {
 static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value,
 		Append_env_pair_info *info) {
 #ifdef WIN32
-	info->string << key << "=" << value;
-	info->string.append_know_length("\1", 1, String::L_AS_IS); // placeholder for of zero byte
+	info->body << key << "=" << value;
+	info->body.append_know_length("\1", 1); // placeholder for of zero byte
 #else
-	StringBody body;
-	body << key << "=" << value;
+	String::Body body;
+	body << key << "=" << value.cstr();
 
 	*(info->env_ref++)=body.cstrm();
 #endif
 }
 
-/// @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,24 +335,23 @@ 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;
+	const char* script_spec_cstr=file_spec.cstr(String::L_FILE_SPEC);
+	const char* cmd=buildCommand(script_spec_cstr, argv);
+	char* env_cstr=0;
 	if(env) {
-		String string;
-		Append_env_pair_info info(string);
+		String::Body body;
+		Append_env_pair_info info(body);
 		env->for_each(append_env_pair, &info);
-		env_cstr=info.string.cstrm(String::L_UNSPECIFIED);
+		env_cstr=info.body.cstrm();
 		for(char* replacer=env_cstr; *replacer; replacer++)
 			if(*replacer=='\1')
 				*replacer=0;
 	}
-	if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) {
+	if(DWORD error=CreateHiddenConsoleProcess(cmd, script_spec_cstr, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) {
 		char szErrorDesc[MAX_STRING];
 		const char* param="the file you tried to run";
 		size_t error_size=FormatMessage(
@@ -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;