--- rpl/src/chainage.c	2010/09/07 20:59:06	1.21
+++ rpl/src/chainage.c	2015/01/05 13:12:29	1.60
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.19
-  Copyright (C) 1989-2010 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.19
+  Copyright (C) 1989-2015 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -45,16 +45,16 @@ chainage(struct_processus *s_etat_proces
 
 	int						caractere;
 	int						erreur;
-	int						erreur_os;
 
 	logical1				drapeau_fin;
+	logical1				erreur_os;
 	logical1				existence;
 	logical1				initialisation;
 	logical1				ouverture;
 	logical1				presence_chaine;
 
-	long					i;
-	long					nombre_caracteres_source;
+	integer8				i;
+	integer8				nombre_caracteres_source;
 
 	unsigned char			*commande;
 	unsigned char			*executable_candidat;
@@ -71,11 +71,12 @@ chainage(struct_processus *s_etat_proces
 	unsigned char			*instructions = BOURNE_SHELL " -c \""
 									"%s/bin/%s %s | "
 									"%s/bin/rpliconv `%s/bin/rplfile "
-									"-m %s/share/rplfiles -i %s | %s/bin/rplawk "
+									"-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";
+									"$2); }'` -t %s//IGNORE > %s\"";
 #	endif
 
 	unsigned long			unite_fichier;
@@ -144,15 +145,8 @@ chainage(struct_processus *s_etat_proces
 				return(d_erreur);
 			}
 
-			if (controle(s_etat_processus, executable_candidat, "md5",
-					rpliconv_md5) != d_vrai)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
-				return(d_erreur);
-			}
-
-			if (controle(s_etat_processus, executable_candidat, "sha1",
-					rpliconv_sha1) != d_vrai)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+						"rpliconv") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -167,15 +161,8 @@ chainage(struct_processus *s_etat_proces
 				return(d_erreur);
 			}
 
-			if (controle(s_etat_processus, executable_candidat, "md5",
-					rplfile_md5) != d_vrai)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
-				return(d_erreur);
-			}
-
-			if (controle(s_etat_processus, executable_candidat, "sha1",
-					rplfile_sha1) != d_vrai)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplfile") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -190,15 +177,8 @@ chainage(struct_processus *s_etat_proces
 				return(d_erreur);
 			}
 
-			if (controle(s_etat_processus, executable_candidat, "md5",
-					rplpp_md5) != d_vrai)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
-				return(d_erreur);
-			}
-
-			if (controle(s_etat_processus, executable_candidat, "sha1",
-					rplpp_sha1) != d_vrai)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplpp") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -213,15 +193,8 @@ chainage(struct_processus *s_etat_proces
 				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)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplawk") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -262,15 +235,8 @@ chainage(struct_processus *s_etat_proces
 				return(d_erreur);
 			}
 
-			if (controle(s_etat_processus, executable_candidat, "md5",
-					rpliconv_md5) != d_vrai)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
-				return(d_erreur);
-			}
-
-			if (controle(s_etat_processus, executable_candidat, "sha1",
-					rpliconv_sha1) != d_vrai)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rpliconv") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -285,15 +251,8 @@ chainage(struct_processus *s_etat_proces
 				return(d_erreur);
 			}
 
-			if (controle(s_etat_processus, executable_candidat, "md5",
-					rplfile_md5) != d_vrai)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
-				return(d_erreur);
-			}
-
-			if (controle(s_etat_processus, executable_candidat, "sha1",
-					rplfile_sha1) != d_vrai)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplfile") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -308,15 +267,8 @@ chainage(struct_processus *s_etat_proces
 				return(d_erreur);
 			}
 
-			if (controle(s_etat_processus, executable_candidat, "md5",
-					rplpp_md5) != d_vrai)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
-				return(d_erreur);
-			}
-
-			if (controle(s_etat_processus, executable_candidat, "sha1",
-					rplpp_sha1) != d_vrai)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplpp") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -331,15 +283,8 @@ chainage(struct_processus *s_etat_proces
 				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)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplawk") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -388,7 +333,8 @@ chainage(struct_processus *s_etat_proces
 		}
 
 		(*s_etat_processus).definitions_chainees = (unsigned char *)
-				malloc((nombre_caracteres_source + 1) * sizeof(unsigned char));
+				malloc((((size_t) nombre_caracteres_source) + 1)
+				* sizeof(unsigned char));
 		
 		if ((*s_etat_processus).definitions_chainees == NULL)
 		{
@@ -471,8 +417,8 @@ chainage(struct_processus *s_etat_proces
 						}
 					}
 
-					if ((((*s_etat_processus).definitions_chainees)[i] =
-							caractere) == '\"')
+					if (((int) (((*s_etat_processus).definitions_chainees)[i] =
+							((unsigned char) caractere))) == '\"')
 					{
 						if (i > 0)
 						{
@@ -508,7 +454,7 @@ chainage(struct_processus *s_etat_proces
 		}
 
 		(*s_etat_processus).longueur_definitions_chainees =
-				strlen((*s_etat_processus).definitions_chainees);
+				(integer8) strlen((*s_etat_processus).definitions_chainees);
 
 		if (fclose(f_source) != 0)
 		{
@@ -542,8 +488,8 @@ chainage(struct_processus *s_etat_proces
 
 	if (((*s_etat_processus).definitions_chainees =
 			realloc((*s_etat_processus).definitions_chainees,
-			((*s_etat_processus).longueur_definitions_chainees + 1) *
-			sizeof(unsigned char))) == NULL)
+			(((size_t) (*s_etat_processus).longueur_definitions_chainees) + 1)
+			* sizeof(unsigned char))) == NULL)
 	{
 		(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 		return(d_erreur);