--- rpl/src/instructions_s8.c	2010/08/26 19:07:40	1.18
+++ rpl/src/instructions_s8.c	2012/04/12 09:56:40	1.45
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.19
-  Copyright (C) 1989-2010 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.7
+  Copyright (C) 1989-2012 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -248,27 +248,23 @@ instruction_send(struct_processus *s_eta
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
 #		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
-		}
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
-#		endif
 
 		while((longueur_ecriture = write_atomic(s_etat_processus,
 				(*s_etat_processus).pipe_nombre_objets_attente,
 				&pid, sizeof(pid))) != sizeof(pid))
 		{
 #			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
 				if (errno != EINTR)
@@ -293,18 +289,16 @@ instruction_send(struct_processus *s_eta
 			INCR_GRANULARITE(attente.tv_nsec);
 
 #			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
 		pid = getpid();
@@ -317,9 +311,9 @@ instruction_send(struct_processus *s_eta
 				&pid, sizeof(pid))) != sizeof(pid))
 		{
 #			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
 				if (errno != EINTR)
@@ -344,20 +338,22 @@ instruction_send(struct_processus *s_eta
 			INCR_GRANULARITE(attente.tv_nsec);
 
 #			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
 #		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			if (errno != EINTR)
@@ -385,34 +381,27 @@ instruction_send(struct_processus *s_eta
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
 #		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
-		}
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
-#		endif
 
 		while((longueur_ecriture = write_atomic(s_etat_processus,
 				(*s_etat_processus).pipe_nombre_objets_attente,
 				&tid, sizeof(tid))) != sizeof(tid))
 		{
 #			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 
 			if (longueur_ecriture == -1)
@@ -430,18 +419,16 @@ instruction_send(struct_processus *s_eta
 			INCR_GRANULARITE(attente.tv_nsec);
 
 #			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
 		tid = pthread_self();
@@ -454,9 +441,9 @@ instruction_send(struct_processus *s_eta
 				&tid, sizeof(tid))) != sizeof(tid))
 		{
 #			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
 				if (errno != EINTR)
@@ -481,31 +468,26 @@ instruction_send(struct_processus *s_eta
 			INCR_GRANULARITE(attente.tv_nsec);
 
 #			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
 #		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
-			if (errno != EINTR)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
 		}
 	}
 
@@ -515,26 +497,22 @@ instruction_send(struct_processus *s_eta
 	attente.tv_nsec = GRANULARITE_us * 1000;
 
 #	ifndef SEMAPHORES_NOMMES
-	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
-	}
+		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #	else
-	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#	endif
 	{
 		(*s_etat_processus).erreur_systeme = d_es_processus;
 		return;
 	}
-#	endif
 
 	while(read_atomic(s_etat_processus, (*s_etat_processus).pipe_acquittement,
 			&tampon, sizeof(unsigned char)) != sizeof(unsigned char))
 	{
 #		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			if (errno != EINTR)
@@ -548,20 +526,22 @@ instruction_send(struct_processus *s_eta
 		INCR_GRANULARITE(attente.tv_nsec);
 
 #		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
+
+		scrutation_interruptions(s_etat_processus);
 	}
 
 #	ifndef SEMAPHORES_NOMMES
-	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+		while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #	else
-	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+		while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #	endif
 	{
 		if (errno != EINTR)
@@ -582,9 +562,9 @@ instruction_send(struct_processus *s_eta
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
 #		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
@@ -596,16 +576,13 @@ instruction_send(struct_processus *s_eta
 				&pid, sizeof(pid))) != sizeof(pid))
 		{
 #			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 
 			if (longueur_ecriture == -1)
@@ -623,24 +600,20 @@ instruction_send(struct_processus *s_eta
 			INCR_GRANULARITE(attente.tv_nsec);
 
 #			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
 		}
 
 #		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			if (errno != EINTR)
@@ -649,6 +622,8 @@ instruction_send(struct_processus *s_eta
 				return;
 			}
 		}
+
+		scrutation_interruptions(s_etat_processus);
 	}
 	else
 	{
@@ -658,9 +633,9 @@ instruction_send(struct_processus *s_eta
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
 #		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
@@ -672,9 +647,9 @@ instruction_send(struct_processus *s_eta
 				&tid, sizeof(tid))) != sizeof(tid))
 		{
 #			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
 				if (errno != EINTR)
@@ -699,20 +674,22 @@ instruction_send(struct_processus *s_eta
 			INCR_GRANULARITE(attente.tv_nsec);
 
 #			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
 #			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
 #		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			if (errno != EINTR)
@@ -726,26 +703,22 @@ instruction_send(struct_processus *s_eta
 	// ecriture_pipe() ne peut être interrompu par un signal.
 
 #	ifndef SEMAPHORES_NOMMES
-	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
-	}
+		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 #	else
-	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#	endif
 	{
 		(*s_etat_processus).erreur_systeme = d_es_processus;
 		return;
 	}
-#	endif
 
 	if (ecriture_pipe(s_etat_processus, (*s_etat_processus).pipe_donnees,
 			s_objet) == d_erreur)
 	{
 #		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #		endif
 		{
 			if (errno != EINTR)
@@ -765,9 +738,9 @@ instruction_send(struct_processus *s_eta
 	}
 
 #	ifndef SEMAPHORES_NOMMES
-	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+		while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
 #	else
-	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+		while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
 #	endif
 	{
 		if (errno != EINTR)
@@ -814,25 +787,17 @@ instruction_sqlquery(struct_processus *s
 {
 #	define							d_LONGUEUR	1024
 
+#	if defined(MYSQL_SUPPORT) || defined(POSTGRESQL_SUPPORT)
 	logical1						connexion_permanente;
-	logical1						presence_resultat;
+#	endif
 
 	struct_objet					*s_copie_1;
 	struct_objet					*s_objet_1;
 	struct_objet					*s_copie_2;
 	struct_objet					*s_objet_2;
-	struct_objet					*s_objet_resultat;
-
-	struct_liste_chainee			*l_element_courant;
-	struct_liste_chainee			*l_element_courant_ligne;
 
 	unsigned char					*tampon;
 
-	unsigned int					i;
-	unsigned int					j;
-	unsigned int					nombre_colonnes;
-	unsigned int					nombre_lignes;
-
 	(*s_etat_processus).erreur_execution = d_ex;
 
 	if ((*s_etat_processus).affichage_arguments == 'Y')
@@ -907,7 +872,9 @@ instruction_sqlquery(struct_processus *s
 
 	if ((*s_objet_1).type == LST)
 	{
+#	if defined(MYSQL_SUPPORT) || defined(POSTGRESQL_SUPPORT)
 		connexion_permanente = d_faux;
+#	endif
 
 		s_copie_1 = s_objet_1;
 
@@ -918,6 +885,16 @@ instruction_sqlquery(struct_processus *s
 			return;
 		}
 
+		if ((*s_etat_processus).erreur_execution ==
+				d_ex_instruction_indisponible)
+		{
+			liberation(s_etat_processus, s_objet_1);
+			liberation(s_etat_processus, s_objet_2);
+			liberation(s_etat_processus, s_copie_1);
+
+			return;
+		}
+
 		liberation(s_etat_processus, s_copie_1);
 	}
 	else
@@ -937,7 +914,9 @@ instruction_sqlquery(struct_processus *s
 			}
 		}
 
+#	if defined(MYSQL_SUPPORT) || defined(POSTGRESQL_SUPPORT)
 		connexion_permanente = d_vrai;
+#	endif
 	}
 
 	if (((*s_objet_1).type == SQL) && ((*s_objet_2).type == CHN))
@@ -979,8 +958,18 @@ instruction_sqlquery(struct_processus *s
 		{
 #			ifdef MYSQL_SUPPORT
 
-			MYSQL_RES		*resultat_mysql;
-			MYSQL_ROW		ligne;
+			unsigned int				i;
+			unsigned int				nombre_colonnes;
+
+			logical1					presence_resultat;
+
+			MYSQL_RES					*resultat_mysql;
+			MYSQL_ROW					ligne;
+
+			struct_objet				*s_objet_resultat;
+
+			struct_liste_chainee		*l_element_courant;
+			struct_liste_chainee		*l_element_courant_ligne;
 
 			if (mysql_real_query((*((struct_connecteur_sql *) (*s_objet_1)
 					.objet)).descripteur.mysql, (unsigned char *) (*s_objet_2)
@@ -1182,7 +1171,19 @@ instruction_sqlquery(struct_processus *s
 		{
 #			ifdef POSTGRESQL_SUPPORT
 
-			PGresult		*resultat_postgresql;
+			unsigned int				i;
+			unsigned int				j;
+			unsigned int				nombre_colonnes;
+			unsigned int				nombre_lignes;
+
+			logical1					presence_resultat;
+
+			PGresult					*resultat_postgresql;
+
+			struct_objet				*s_objet_resultat;
+
+			struct_liste_chainee		*l_element_courant;
+			struct_liste_chainee		*l_element_courant_ligne;
 
 			if (PQstatus((*((struct_connecteur_sql *) (*s_objet_1).objet))
 					.descripteur.postgresql) != CONNECTION_OK)
@@ -1470,11 +1471,6 @@ instruction_stop(struct_processus *s_eta
 
 	struct_objet				*s_objet;
 
-	struct timespec				attente;
-
-	attente.tv_sec = 0;
-	attente.tv_nsec = GRANULARITE_us * 1000;
-
 	(*s_etat_processus).erreur_execution = d_ex;
 
 	if ((*s_etat_processus).affichage_arguments == 'Y')
@@ -1520,8 +1516,8 @@ instruction_stop(struct_processus *s_eta
 		if ((*(*((struct_processus_fils *) (*s_objet).objet)).thread)
 				.processus_detache == d_vrai)
 		{
-			kill((*(*((struct_processus_fils *) (*s_objet).objet)).thread).pid,
-					SIGFSTOP);
+			envoi_signal_processus((*(*((struct_processus_fils *)
+					(*s_objet).objet)).thread).pid, rpl_sigstop);
 		}
 		else
 		{
@@ -1581,8 +1577,8 @@ instruction_stop(struct_processus *s_eta
 					if ((*(*((struct_processus_fils *)
 							(*s_objet).objet)).thread).thread_actif == d_vrai)
 					{
-						pthread_kill((*(*((struct_processus_fils *)
-								(*s_objet).objet)).thread).tid, SIGFSTOP);
+						envoi_signal_thread((*(*((struct_processus_fils *)
+								(*s_objet).objet)).thread).tid, rpl_sigstop);
 					}
 
 					if (pthread_mutex_unlock(&((*(*((struct_processus_fils *)