--- rpl/src/rpl.c	2010/08/22 16:38:36	1.42
+++ rpl/src/rpl.c	2011/01/03 12:08:09	1.57
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.18
-  Copyright (C) 1989-2010 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.0.20
+  Copyright (C) 1989-2011 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -23,7 +23,7 @@
 #define  MAIN_RPL
 #include "rpl-conv.h"
 
-#ifdef SEMAPHORES_SYSV
+#ifdef IPCS_SYSV
 #ifndef OS2
 	unsigned char		*chemin_semaphores_SysV;
 #endif
@@ -107,6 +107,10 @@ rplinit(int argc, char *argv[], unsigned
 
 	errno = 0;
 
+#	ifdef DMALLOC
+	atexit(dmalloc_shutdown());
+#	endif
+
 #	ifdef DEBUG_MEMOIRE
 	debug_memoire_initialisation();
 #	endif
@@ -240,7 +244,7 @@ rplinit(int argc, char *argv[], unsigned
 	(*s_etat_processus).chemin_fichiers_temporaires =
 			recherche_chemin_fichiers_temporaires(s_etat_processus);
 
-#	ifdef SEMAPHORES_SYSV
+#	ifdef IPCS_SYSV
 #	ifndef OS2
 	chemin_semaphores_SysV = (*s_etat_processus).chemin_fichiers_temporaires;
 #	endif
@@ -248,7 +252,17 @@ rplinit(int argc, char *argv[], unsigned
 
 #	ifdef _BROKEN_SIGINFO
 	creation_fifos_signaux(s_etat_processus);
+#	ifdef return
+#		undef return
+#	endif
+#	define return destruction_fifos_signaux(s_etat_processus); return
+#	endif
 
+	insertion_thread(s_etat_processus, d_vrai);
+
+#	ifndef OS2
+	localisation_courante(s_etat_processus);
+#	else
 	if ((*s_etat_processus).erreur_systeme != d_es)
 	{
 		if (((*s_etat_processus).localisation = malloc((strlen(d_locale) + 1) *
@@ -268,15 +282,8 @@ rplinit(int argc, char *argv[], unsigned
 
 		strcpy((*s_etat_processus).localisation, d_locale);
 	}
-#	ifdef return
-#		undef return
 #	endif
-#	define return destruction_fifos_signaux(s_etat_processus); return
-#	endif
-
-	insertion_thread(s_etat_processus, d_vrai);
 
-	localisation_courante(s_etat_processus);
 	(*s_etat_processus).erreur_systeme = d_es;
 
 	if ((*s_etat_processus).localisation == NULL)
@@ -304,11 +311,11 @@ rplinit(int argc, char *argv[], unsigned
 
 	if ((*s_etat_processus).langue == 'F')
 	{
-		printf("+++Copyright (C) 1989 à 2009, 2010 BERTRAND Joël\n");
+		printf("+++Copyright (C) 1989 à 2010, 2011 BERTRAND Joël\n");
 	}
 	else
 	{
-		printf("+++Copyright (C) 1989 to 2009, 2010 BERTRAND Joel\n");
+		printf("+++Copyright (C) 1989 to 2010, 2011 BERTRAND Joel\n");
 	}
 
 	if (getenv("HOME") != NULL)
@@ -435,6 +442,23 @@ rplinit(int argc, char *argv[], unsigned
 		return(EXIT_FAILURE);
 	}
 
+	if (sigaction(SIGTERM, &action, NULL) != 0)
+	{
+		erreur = d_es_signal;
+
+		if ((*s_etat_processus).langue == 'F')
+		{
+			printf("+++Système : Initialisation des signaux POSIX "
+					"impossible\n");
+		}
+		else
+		{
+			printf("+++System : Initialization of POSIX signals failed\n");
+		}
+
+		return(EXIT_FAILURE);
+	}
+
 #	ifndef _BROKEN_SIGINFO
 	action.sa_sigaction = interruption2;
 #	else
@@ -1817,6 +1841,7 @@ rplinit(int argc, char *argv[], unsigned
 			(*s_etat_processus).autorisation_empilement_programme = 'N';
 			(*s_etat_processus).requete_arret = 'N';
 			(*s_etat_processus).evaluation_forcee = 'N';
+			(*s_etat_processus).recherche_type = 'N';
 
 			(*s_etat_processus).constante_symbolique = 'N';
 			(*s_etat_processus).traitement_symbolique = 'N';
@@ -1972,6 +1997,7 @@ rplinit(int argc, char *argv[], unsigned
 			(*s_etat_processus).pid_processus_pere = getpid();
 			(*s_etat_processus).processus_detache = d_vrai;
 			(*s_etat_processus).var_volatile_processus_pere = -1;
+			(*s_etat_processus).var_volatile_processus_racine = -1;
 			(*s_etat_processus).var_volatile_traitement_retarde_stop = 0;
 			(*s_etat_processus).var_volatile_alarme = 0;
 			(*s_etat_processus).var_volatile_requete_arret = 0;
@@ -3553,12 +3579,6 @@ rplinit(int argc, char *argv[], unsigned
 		}
 	}
 
-#	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
-
 	closelog();
 
 	pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));