--- rpl/src/rpl.c	2010/04/28 11:05:45	1.22
+++ rpl/src/rpl.c	2010/08/17 11:59:28	1.40
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.15
+  RPL/2 (R) version 4.0.18
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -21,7 +21,13 @@
 
 
 #define  MAIN_RPL
-#include "rpl.conv.h"
+#include "rpl-conv.h"
+
+#ifdef SEMAPHORES_SYSV
+#ifndef OS2
+	unsigned char		*chemin_semaphores_SysV;
+#endif
+#endif
 
 
 /*
@@ -33,8 +39,8 @@
 int
 rplinit(int argc, char *argv[], unsigned char ***resultats, char *rpl_home)
 {
-#	include								"copyright.conv.h"
-#	include								"licence.conv.h"
+#	include								"copyright-conv.h"
+#	include								"licence-conv.h"
 
 	file								*f_source;
 
@@ -99,6 +105,12 @@ rplinit(int argc, char *argv[], unsigned
 	volatile int						erreur;
 	volatile unsigned char				traitement_fichier_temporaire;
 
+	errno = 0;
+
+#	ifdef DEBUG_MEMOIRE
+	debug_memoire_initialisation();
+#	endif
+
 	setvbuf(stdout, NULL, _IOLBF, 0);
 	setvbuf(stderr, NULL, _IOLBF, 0);
 
@@ -184,6 +196,12 @@ rplinit(int argc, char *argv[], unsigned
 	pthread_mutex_init(&((*s_etat_processus).mutex), &attributs_mutex);
 	pthread_mutexattr_destroy(&attributs_mutex);
 
+	pthread_mutexattr_init(&attributs_mutex);
+	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
+	pthread_mutex_init(&((*s_etat_processus).mutex_allocation),
+			&attributs_mutex);
+	pthread_mutexattr_destroy(&attributs_mutex);
+
 #	ifndef SEMAPHORES_NOMMES
 	sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);
 #	else
@@ -221,6 +239,24 @@ rplinit(int argc, char *argv[], unsigned
 			.mutex), &attributs_mutex);
 	pthread_mutexattr_destroy(&attributs_mutex);
 
+	(*s_etat_processus).chemin_fichiers_temporaires =
+			recherche_chemin_fichiers_temporaires(s_etat_processus);
+
+#	ifdef SEMAPHORES_SYSV
+#	ifndef OS2
+	chemin_semaphores_SysV = (*s_etat_processus).chemin_fichiers_temporaires;
+#	endif
+#	endif
+
+#	ifdef _BROKEN_SIGINFO
+	creation_fifos_signaux(s_etat_processus);
+
+#	ifdef return
+#		undef return
+#	endif
+#	define return destruction_fifos_signaux(s_etat_processus); return
+#	endif
+
 	localisation_courante(s_etat_processus);
 	(*s_etat_processus).erreur_systeme = d_es;
 
@@ -317,7 +353,7 @@ rplinit(int argc, char *argv[], unsigned
 	// Initialisation d'une pile de signal pour récupérer les
 	// débordement de pile
 
-#	ifndef Cygwin
+#	if !defined(Cygwin) && !defined(OpenBSD)
 	if (((*s_etat_processus).pile_signal.ss_sp =
 			malloc((*s_etat_processus).pile_signal.ss_size =
 			SIGSTKSZ)) == NULL)
@@ -356,7 +392,11 @@ rplinit(int argc, char *argv[], unsigned
 	}
 #	endif
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption1;
+#	else
+	action.sa_handler = interruption1;
+#	endif
 	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGINT, &action, NULL) != 0)
@@ -376,7 +416,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption2;
+#	else
+	action.sa_handler = interruption2;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGTSTP, &action, NULL) != 0)
@@ -394,7 +438,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption4;
+#	else
+	action.sa_handler = interruption4;
+#	endif
 	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGSTART, &action, NULL) != 0)
@@ -427,7 +475,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption5;
+#	else
+	action.sa_handler = interruption5;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGFSTOP, &action, NULL) != 0)
@@ -447,7 +499,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
-	action.sa_sigaction = interruption5;
+#	ifndef _BROKEN_SIGINFO
+	action.sa_sigaction = interruption11;
+#	else
+	action.sa_handler = interruption11;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGFABORT, &action, NULL) != 0)
@@ -467,7 +523,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption8;
+#	else
+	action.sa_handler = interruption8;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGURG, &action, NULL) != 0)
@@ -487,7 +547,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption7;
+#	else
+	action.sa_handler = interruption7;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGPIPE, &action, NULL) != 0)
@@ -507,7 +571,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption6;
+#	else
+	action.sa_handler = interruption6;
+#	endif
 	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGINJECT, &action, NULL) != 0)
@@ -527,7 +595,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption9;
+#	else
+	action.sa_handler = interruption9;
+#	endif
 	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGABORT, &action, NULL) != 0)
@@ -547,7 +619,11 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption1;
+#	else
+	action.sa_handler = interruption1;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
 	if (sigaction(SIGALRM, &action, NULL) != 0)
@@ -567,12 +643,13 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+#	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption3;
+#	else
+	action.sa_handler = interruption3;
+#	endif
 	action.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
 
-	(*s_etat_processus).chemin_fichiers_temporaires =
-			recherche_chemin_fichiers_temporaires(s_etat_processus);
-
 	erreur = d_absence_erreur;
 	core = d_faux;
 	mode_interactif = d_faux;
@@ -1495,7 +1572,11 @@ rplinit(int argc, char *argv[], unsigned
 
 		if (option_n == d_vrai)
 		{
+#			ifndef _BROKEN_SIGINFO
 			action.sa_sigaction = interruption10;
+#			else
+			action.sa_handler = interruption10;
+#			endif
 			action.sa_flags = SA_ONSTACK | SA_SIGINFO;
 
 			if (sigaction(SIGHUP, &action, NULL) != 0)
@@ -1861,6 +1942,8 @@ rplinit(int argc, char *argv[], unsigned
 			}
 
 			(*s_etat_processus).at_exit = NULL;
+			(*s_etat_processus).at_poke = NULL;
+			(*s_etat_processus).traitement_at_poke = 'N';
 
 			(*s_etat_processus).pointeurs_caracteres = NULL;
 			(*s_etat_processus).arbre_instructions = NULL;
@@ -1897,7 +1980,7 @@ rplinit(int argc, char *argv[], unsigned
 			}
 
 			if (((*s_etat_processus).instruction_derniere_erreur =
-					malloc(2 * sizeof(unsigned char))) == NULL)
+					malloc(sizeof(unsigned char))) == NULL)
 			{
 				erreur = d_es_allocation_memoire;
 
@@ -2653,11 +2736,11 @@ rplinit(int argc, char *argv[], unsigned
 										(*s_etat_processus).at_exit, 'E');
 							}
 						}
-
-						liberation(s_etat_processus,
-								(*s_etat_processus).at_exit);
 					}
 
+					liberation(s_etat_processus, (*s_etat_processus).at_exit);
+					liberation(s_etat_processus, (*s_etat_processus).at_poke);
+
 					if ((*s_etat_processus).generateur_aleatoire != NULL)
 					{
 						liberation_generateur_aleatoire(s_etat_processus);
@@ -2864,13 +2947,6 @@ rplinit(int argc, char *argv[], unsigned
 						l_element_courant = (void *)
 								(*s_etat_processus).l_base_pile_processus;
 
-						if ((*s_etat_processus)
-								.nombre_interruptions_non_affectees != 0)
-						{
-							affectation_interruptions_logicielles(
-									s_etat_processus);
-						}
-
 						for(i = 0; i < (unsigned long)
 								(*(*((struct_processus_fils *)
 								(*(*((struct_liste_chainee *)
@@ -2929,6 +3005,14 @@ rplinit(int argc, char *argv[], unsigned
 						}
 
 						pthread_mutex_unlock(&((*s_etat_processus).mutex));
+
+						if ((*s_etat_processus)
+								.nombre_interruptions_non_affectees != 0)
+						{
+							affectation_interruptions_logicielles(
+									s_etat_processus);
+						}
+
 						nanosleep(&attente, NULL);
 						pthread_mutex_lock(&((*s_etat_processus).mutex));
 					}
@@ -3398,8 +3482,6 @@ rplinit(int argc, char *argv[], unsigned
 						l_element_courant = l_element_suivant;
 					}
 
-					free((*s_etat_processus).chemin_fichiers_temporaires);
-
 					l_element_courant = (*s_etat_processus).s_marques;
 					while(l_element_courant != NULL)
 					{
@@ -3451,7 +3533,9 @@ rplinit(int argc, char *argv[], unsigned
 		}
 	}
 
-#	ifndef Cygwin
+#	if !defined(Cygwin) && !defined(OpenBSD)
+	(*s_etat_processus).pile_signal.ss_flags = SS_DISABLE;
+	sigaltstack(&((*s_etat_processus).pile_signal), NULL);
 	free((*s_etat_processus).pile_signal.ss_sp);
 #	endif
 
@@ -3464,6 +3548,8 @@ rplinit(int argc, char *argv[], unsigned
 	retrait_thread(s_etat_processus);
 
 	pthread_mutex_destroy(&((*s_etat_processus).mutex));
+	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));
+
 #	ifndef SEMAPHORES_NOMMES
 	sem_post(&((*s_etat_processus).semaphore_fork));
 	sem_destroy(&((*s_etat_processus).semaphore_fork));
@@ -3473,7 +3559,6 @@ rplinit(int argc, char *argv[], unsigned
 #	endif
 
 	free((*s_etat_processus).localisation);
-	free(s_etat_processus);
 
 #	ifndef SEMAPHORES_NOMMES
 	sem_destroy(&semaphore_liste_threads);
@@ -3491,8 +3576,17 @@ rplinit(int argc, char *argv[], unsigned
 			sem_gestionnaires_signaux_atomique);
 #	endif
 
+#	ifdef _BROKEN_SIGINFO
+	destruction_fifos_signaux(s_etat_processus);
+#	undef return
+#	endif
+
+	free((*s_etat_processus).chemin_fichiers_temporaires);
+	free(s_etat_processus);
+
 #	ifdef DEBUG_MEMOIRE
-	debug_memoire_verification(s_etat_processus);
+	debug_memoire_verification();
+	analyse_post_mortem();
 #	endif
 
 	return((erreur == d_absence_erreur) ? EXIT_SUCCESS : EXIT_FAILURE);