--- rpl/src/instructions_r3.c	2010/01/26 15:22:45	1.1.1.1
+++ rpl/src/instructions_r3.c	2010/03/05 11:20:08	1.6
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.9
+  RPL/2 (R) version 4.0.12
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -968,6 +968,7 @@ instruction_recall(struct_processus *s_e
 	struct_objet			*s_objet_temporaire;
 
 	unsigned char			*commande;
+	unsigned char			*executable_candidat;
 	unsigned char			*instructions = "%s/bin/rpliconv %s "
 									"`%s/bin/rplfile "
 									"-m %s/share/rplfiles -i %s | awk "
@@ -1044,20 +1045,181 @@ instruction_recall(struct_processus *s_e
 			return;
 		}
 
-		if ((commande = malloc((strlen(ds_preprocesseur) +
-				(2 * strlen((unsigned char *) (*s_objet).objet)) +
-				(4 * strlen(d_exec_path)) + 
-				strlen(nom_fichier_temporaire) + strlen(instructions) - 11) *
-				sizeof(unsigned char))) == NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande = malloc((strlen(ds_preprocesseur) +
+					(2 * strlen((unsigned char *) (*s_objet).objet)) +
+					(4 * strlen(d_exec_path)) + 
+					strlen(nom_fichier_temporaire) + strlen(instructions) - 11)
+					* sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande, instructions, d_exec_path,
+					(unsigned char *) (*s_objet).objet,
+					d_exec_path, d_exec_path,
+					(unsigned char *) (*s_objet).objet,
+					d_exec_path, ds_preprocesseur, nom_fichier_temporaire);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
+					d_exec_path) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rpliconv_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rpliconv_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplfile",
+					d_exec_path) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplfile_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplfile_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplpp",
+					d_exec_path) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplpp_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplpp_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			free(executable_candidat);
 		}
+		else
+		{
+			if ((commande = malloc((strlen(ds_preprocesseur) +
+					(2 * strlen((unsigned char *) (*s_objet).objet)) +
+					(4 * strlen((*s_etat_processus).rpl_home)) + 
+					strlen(nom_fichier_temporaire) + strlen(instructions) - 11)
+					* sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande, instructions, (*s_etat_processus).rpl_home,
+					(unsigned char *) (*s_objet).objet,
+					(*s_etat_processus).rpl_home, (*s_etat_processus).rpl_home,
+					(unsigned char *) (*s_objet).objet,
+					(*s_etat_processus).rpl_home, ds_preprocesseur,
+					nom_fichier_temporaire);
 
-		sprintf(commande, instructions, d_exec_path,
-				(unsigned char *) (*s_objet).objet,
-				d_exec_path, d_exec_path, (unsigned char *) (*s_objet).objet,
-				d_exec_path, ds_preprocesseur, nom_fichier_temporaire);
+			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
+					(*s_etat_processus).rpl_home) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rpliconv_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rpliconv_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplfile",
+					(*s_etat_processus).rpl_home) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplfile_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplfile_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplpp",
+					(*s_etat_processus).rpl_home) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplpp_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplpp_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			free(executable_candidat);
+		}
 
 		if ((pipe = popen(commande, "r")) == NULL)
 		{