--- rpl/src/rpl.h	2011/11/19 17:53:46	1.142
+++ rpl/src/rpl.h	2012/03/01 10:14:08	1.158
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.4
-  Copyright (C) 1989-2011 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.
 
@@ -71,6 +71,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <poll.h>
 
 #ifndef RPLARGS
 #	include <sys/mman.h>
@@ -91,6 +92,7 @@
 #	include <dlfcn.h>
 #	include <fcntl.h>
 #	include <pthread.h>
+#	include <regex.h>
 
 #	ifdef OS2
 #		undef pthread_mutexattr_settype
@@ -337,8 +339,9 @@ union semun
 //	SIGINT
 //	SIGTSTP
 //	SIGCONT
-//	SIGURG
 //	SIGPIPE
+//	SIGUSR1 et SIGUSR2 sont utilisé par libsigsegv.
+//	SIGHUP
 //	SIGALRM
 
 #	define SIGTEST					SIGUSR1
@@ -797,6 +800,7 @@ pid_t debug_fork();
 #	define d_es_contexte						__erreur(2013)
 #	define d_es_somme_controle					__erreur(2014)
 #	define d_es_semaphore						__erreur(2015)
+#	define d_es_mutex_acquis_autre_thread		__erreur(2016)
 #endif
 
 /*
@@ -936,6 +940,8 @@ pid_t debug_fork();
 #	define d_ex_creation_variable_globale		__erreur(83)
 #	define d_ex_erreur_interne_rplcas			__erreur(84)
 #	define d_ex_fichier_corrompu				__erreur(85)
+#	define d_ex_mutex_acquis_autre_thread		__erreur(86)
+#	define d_ex_expression_reguliere			__erreur(87)
 #endif
 
 
@@ -1123,6 +1129,7 @@ typedef struct fichier
 typedef struct rpl_mutex
 {
 	pthread_mutex_t		mutex;
+	pthread_t			tid;
 } struct_mutex;
 #endif
 
@@ -2164,6 +2171,7 @@ typedef struct processus
 
 	pid_t						pid_processus_pere;
 	pthread_t					tid_processus_pere;
+	pthread_t					tid;
 
 	logical1					processus_detache;
 
@@ -2191,6 +2199,10 @@ typedef struct processus
 	struct_liste_chainee		*liste_mutexes;
 	pthread_mutex_t				protection_liste_mutexes;
 
+/* Drapeau nécessaire à RESTART					*/
+
+	volatile logical1			requete_redemarrage;
+
 /* Gestion optimisée de la mémoire					*/
 
 	double						estimation_taille_pile_tampon;
@@ -2578,6 +2590,7 @@ void instruction_pmax(struct_processus *
 void instruction_pmin(struct_processus *s_etat_processus);
 void instruction_poke(struct_processus *s_etat_processus);
 void instruction_polar(struct_processus *s_etat_processus);
+void instruction_poll(struct_processus *s_etat_processus);
 void instruction_pos(struct_processus *s_etat_processus);
 void instruction_pourcent(struct_processus *s_etat_processus);
 void instruction_pourcent_ch(struct_processus *s_etat_processus);
@@ -2634,9 +2647,11 @@ void instruction_read(struct_processus *
 void instruction_recode(struct_processus *s_etat_processus);
 void instruction_recv(struct_processus *s_etat_processus);
 void instruction_redraw(struct_processus *s_etat_processus);
+void instruction_regex(struct_processus *s_etat_processus);
 void instruction_relax(struct_processus *s_etat_processus);
 void instruction_remove(struct_processus *s_etat_processus);
 void instruction_res(struct_processus *s_etat_processus);
+void instruction_restart(struct_processus *s_etat_processus);
 void instruction_recall(struct_processus *s_etat_processus);
 void instruction_regv(struct_processus *s_etat_processus);
 void instruction_repeat(struct_processus *s_etat_processus);
@@ -2906,6 +2921,7 @@ void interruption2(int signal);
 void interruption3(int signal);
 void interruption4(int signal);
 void interruption5(int signal);
+void interruption6(int signal);
 void interruption_depassement_pile(int urgence, stackoverflow_context_t scp);
 void inversion_matrice(struct_processus *s_etat_processus,
 		struct_matrice *s_matrice);
@@ -3007,7 +3023,8 @@ complex16 sommation_vecteur_complexe(com
 */
 
 #ifndef RPLARGS
-int rplinit(int argc, char *argv[], unsigned char ***resultats, char *rpl_home);
+int rplinit(int argc, char *argv[], char *envp[],
+		unsigned char ***resultats, char *rpl_home);
 #endif
 
 /*
@@ -3120,6 +3137,8 @@ logical1 caracteristiques_fichier(struct
 		unsigned long *unite);
 logical1 controle(struct_processus *s_etat_processus, unsigned char *fichier,
 		unsigned char *type, unsigned char *somme_candidate);
+logical1 controle_integrite(struct_processus *s_etat_processus,
+		unsigned char *executable_candidat, unsigned char *executable);
 logical1 creation_variable(struct_processus *s_etat_processus,
 		struct_variable *s_variable,
 		unsigned char autorisation_creation_variable_statique,
@@ -3213,6 +3232,8 @@ int liste_variables(struct_processus *s_
 		struct_arbre_variables *l_element_courant);
 int nombre_variables(struct_processus *s_etat_processus,
 		struct_arbre_variables *l_element_courant);
+int readline_analyse_syntaxique(int count, int key);
+int readline_effacement(int count, int key);
 #endif
 int tex_fprintf(struct_processus *s_etat_processus,
 		file *flux, const char *format, ...);