--- rpl/src/rpl.c	2010/08/18 12:56:55	1.41
+++ rpl/src/rpl.c	2010/09/23 15:27:41	1.50
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.18
+  RPL/2 (R) version 4.0.20
   Copyright (C) 1989-2010 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
@@ -189,8 +189,6 @@ rplinit(int argc, char *argv[], unsigned
 
 	(*s_etat_processus).rpl_home = rpl_home;
 
-	insertion_thread(s_etat_processus, d_vrai);
-
 	pthread_mutexattr_init(&attributs_mutex);
 	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
 	pthread_mutex_init(&((*s_etat_processus).mutex), &attributs_mutex);
@@ -242,7 +240,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
@@ -250,14 +248,38 @@ 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) *
+				sizeof(unsigned char))) == NULL)
+		{
+			if ((*s_etat_processus).langue == 'F')
+			{
+				uprintf("+++Système : Mémoire insuffisante\n");
+			}
+			else
+			{
+				uprintf("+++System : Not enough memory\n");
+			}
+
+			return(EXIT_FAILURE);
+		}
+
+		strcpy((*s_etat_processus).localisation, d_locale);
+	}
+#	endif
+
 	(*s_etat_processus).erreur_systeme = d_es;
 
 	if ((*s_etat_processus).localisation == NULL)
@@ -397,7 +419,7 @@ rplinit(int argc, char *argv[], unsigned
 #	else
 	action.sa_handler = interruption1;
 #	endif
-	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
+	action.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_NODEFER;
 
 	if (sigaction(SIGINT, &action, NULL) != 0)
 	{
@@ -443,7 +465,7 @@ rplinit(int argc, char *argv[], unsigned
 #	else
 	action.sa_handler = interruption4;
 #	endif
-	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
+	action.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_NODEFER;
 
 	if (sigaction(SIGSTART, &action, NULL) != 0)
 	{
@@ -576,7 +598,7 @@ rplinit(int argc, char *argv[], unsigned
 #	else
 	action.sa_handler = interruption6;
 #	endif
-	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
+	action.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_NODEFER;
 
 	if (sigaction(SIGINJECT, &action, NULL) != 0)
 	{
@@ -600,7 +622,7 @@ rplinit(int argc, char *argv[], unsigned
 #	else
 	action.sa_handler = interruption9;
 #	endif
-	action.sa_flags = SA_ONSTACK | SA_SIGINFO;
+	action.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_NODEFER;
 
 	if (sigaction(SIGABORT, &action, NULL) != 0)
 	{
@@ -1577,7 +1599,7 @@ rplinit(int argc, char *argv[], unsigned
 #			else
 			action.sa_handler = interruption10;
 #			endif
-			action.sa_flags = SA_ONSTACK | SA_SIGINFO;
+			action.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_NODEFER;
 
 			if (sigaction(SIGHUP, &action, NULL) != 0)
 			{
@@ -1952,6 +1974,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;