--- rpl/src/chainage.c	2010/09/07 08:58:04	1.19
+++ rpl/src/chainage.c	2010/09/07 13:31:54	1.20
@@ -62,16 +62,17 @@ chainage(struct_processus *s_etat_proces
 #	ifndef OS2
 	unsigned char			*instructions = "%s/bin/%s %s | "
 									"%s/bin/rpliconv `%s/bin/rplfile "
-									"-m %s/share/rplfiles -i %s | awk "
-									"'{ print $3; }' | awk -F= "
+									"-m %s/share/rplfiles -i %s | "
+									"%s/bin/rplawk "
+									"'{ print $3; }' | %s/bin/rplawk -F= "
 									"'{ if ($2 != \"\") printf(\"-f %%s\", "
 									"$2); }'` -t %s//IGNORE > %s";
 #	else
 	unsigned char			*instructions = "sh -c \""
 									"%s/bin/%s %s | "
 									"%s/bin/rpliconv `%s/bin/rplfile "
-									"-m %s/share/rplfiles -i %s | awk "
-									"'{ print $3; }' | awk -F= "
+									"-m %s/share/rplfiles -i %s | %s/bin/rplawk "
+									"'{ print $3; }' | %s/bin/rplawk -F= "
 									"'{ if ($2 != \\\"\\\") "
 									"printf(\\\"-f %%s\\\", "
 									"$2); }'` -t %s//IGNORE\" > %s";
@@ -119,8 +120,8 @@ chainage(struct_processus *s_etat_proces
 		{
 			if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +
 					(2 * strlen((*s_etat_processus).nom_fichier_source)) +
-					(4 * strlen(d_exec_path)) + strlen(d_locale) +
-					strlen(nom_fichier_temporaire) + strlen(instructions) - 13)
+					(6 * strlen(d_exec_path)) + strlen(d_locale) +
+					strlen(nom_fichier_temporaire) + strlen(instructions) - 21)
 					* sizeof(unsigned char))) == NULL)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
@@ -134,7 +135,7 @@ chainage(struct_processus *s_etat_proces
 					(*s_etat_processus).nom_fichier_source,
 					d_exec_path, d_exec_path,
 					d_exec_path, (*s_etat_processus).nom_fichier_source,
-					d_locale, nom_fichier_temporaire);
+					d_exec_path, d_exec_path, d_locale, nom_fichier_temporaire);
 
 			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
 					d_exec_path) < 0)
@@ -204,13 +205,37 @@ chainage(struct_processus *s_etat_proces
 			}
 
 			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplawk",
+					d_exec_path) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return(d_erreur);
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplawk_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return(d_erreur);
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplawk_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return(d_erreur);
+			}
+
+			free(executable_candidat);
 		}
 		else
 		{
 			if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +
 					(2 * strlen((*s_etat_processus).nom_fichier_source)) +
-					(4 * strlen((*s_etat_processus).rpl_home)) +
-					strlen(nom_fichier_temporaire) + strlen(instructions) - 11)
+					(6 * strlen((*s_etat_processus).rpl_home)) +
+					strlen(d_locale) +
+					strlen(nom_fichier_temporaire) + strlen(instructions) - 21)
 					* sizeof(unsigned char))) == NULL)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
@@ -220,12 +245,15 @@ chainage(struct_processus *s_etat_proces
 			}
 
 			sprintf(commande, instructions,
-					(*s_etat_processus).nom_fichier_source,
 					(*s_etat_processus).rpl_home, ds_preprocesseur,
-					(*s_etat_processus).rpl_home, (*s_etat_processus).rpl_home,
+					(*s_etat_processus).nom_fichier_source,
+					(*s_etat_processus).rpl_home,
+					(*s_etat_processus).rpl_home,
 					(*s_etat_processus).rpl_home,
 					(*s_etat_processus).nom_fichier_source,
-					nom_fichier_temporaire);
+					(*s_etat_processus).rpl_home,
+					(*s_etat_processus).rpl_home,
+					d_locale, nom_fichier_temporaire);
 
 			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
 					(*s_etat_processus).rpl_home) < 0)
@@ -292,6 +320,29 @@ chainage(struct_processus *s_etat_proces
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
+			}
+
+			free(executable_candidat);
+
+			if (alsprintf(&executable_candidat, "%s/bin/rplawk",
+					(*s_etat_processus).rpl_home) < 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return(d_erreur);
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "md5",
+					rplawk_md5) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return(d_erreur);
+			}
+
+			if (controle(s_etat_processus, executable_candidat, "sha1",
+					rplawk_sha1) != d_vrai)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
+				return(d_erreur);
 			}
 
 			free(executable_candidat);