--- rpl/src/instructions_r3.c	2010/04/21 13:45:49	1.10
+++ rpl/src/instructions_r3.c	2010/09/07 20:59:06	1.20
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.15
+  RPL/2 (R) version 4.0.19
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -20,7 +20,7 @@
 */
 
 
-#include "rpl.conv.h"
+#include "rpl-conv.h"
 
 
 /*
@@ -974,12 +974,27 @@ instruction_recall(struct_processus *s_e
 	unsigned char			*chaine;
 	unsigned char			*commande;
 	unsigned char			*executable_candidat;
+
+#	ifndef OS2
 	unsigned char			*instructions = "%s/bin/rpliconv %s "
 									"`%s/bin/rplfile "
-									"-m %s/share/rplfiles -i %s | awk "
-									"'{ print $3; }' | awk -F= '{ if "
+									"-m %s/share/rplfiles -i %s | "
+									"%s/bin/rplawk "
+									"'{ print $3; }' | %s/bin/rplawk -F= '{ if "
 									"($2 != \"\") printf(\"-f %%s\", $2); }'` "
 									"-t `locale charmap` | %s/bin/%s -o %s";
+#	else
+	unsigned char			*instructions = BOURNE_SHELL
+									" -c \"%s/bin/rpliconv %s "
+									"`%s/bin/rplfile "
+									"-m %s/share/rplfiles -i %s | "
+									"%s/bin/rplawk "
+									"'{ print $3; }' | %s/bin/rplawk -F= '{ if "
+									"($2 != \\\"\\\") printf(\\\"-f %%s\\\", "
+									"$2); }'` -t `" d_locale
+									"` | %s/bin/%s -o %s\"";
+#	endif
+
 	unsigned char			*nom_fichier_temporaire;
 	unsigned char			*tampon_definitions_chainees;
 	unsigned char			*tampon_instruction_courante;
@@ -1058,8 +1073,8 @@ instruction_recall(struct_processus *s_e
 		{
 			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)
+					(6 * strlen(d_exec_path)) + 
+					strlen(nom_fichier_temporaire) + strlen(instructions) - 19)
 					* sizeof(unsigned char))) == NULL)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
@@ -1070,6 +1085,7 @@ instruction_recall(struct_processus *s_e
 					(unsigned char *) (*s_objet).objet,
 					d_exec_path, d_exec_path,
 					(unsigned char *) (*s_objet).objet,
+					d_exec_path, d_exec_path,
 					d_exec_path, ds_preprocesseur, nom_fichier_temporaire);
 
 			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
@@ -1140,13 +1156,36 @@ instruction_recall(struct_processus *s_e
 			}
 
 			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplawk",
+					d_exec_path) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplawk_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplawk_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)
+					(6 * strlen((*s_etat_processus).rpl_home)) + 
+					strlen(nom_fichier_temporaire) + strlen(instructions) - 19)
 					* sizeof(unsigned char))) == NULL)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
@@ -1157,6 +1196,7 @@ instruction_recall(struct_processus *s_e
 					(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, (*s_etat_processus).rpl_home,
 					(*s_etat_processus).rpl_home, ds_preprocesseur,
 					nom_fichier_temporaire);
 
@@ -1225,6 +1265,29 @@ instruction_recall(struct_processus *s_e
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return;
+			}
+
+			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplawk",
+					d_exec_path) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplawk_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplawk_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return;
 			}
 
 			free(executable_candidat);