--- rpl/src/chainage.c	2011/08/09 11:31:29	1.36
+++ rpl/src/chainage.c	2020/01/10 11:15:41	1.77
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.3
-  Copyright (C) 1989-2011 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.32
+  Copyright (C) 1989-2020 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;
@@ -138,22 +138,15 @@ chainage(struct_processus *s_etat_proces
 					d_exec_path, (*s_etat_processus).nom_fichier_source,
 					d_exec_path, d_exec_path, d_locale, nom_fichier_temporaire);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
-					d_exec_path) < 0)
+			if (alsprintf(s_etat_processus, &executable_candidat,
+					"%s/bin/rpliconv", d_exec_path) < 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 				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);
@@ -161,22 +154,15 @@ chainage(struct_processus *s_etat_proces
 
 			free(executable_candidat);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rplfile",
-					d_exec_path) < 0)
+			if (alsprintf(s_etat_processus, &executable_candidat,
+					"%s/bin/rplfile", d_exec_path) < 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 				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);
@@ -184,22 +170,15 @@ chainage(struct_processus *s_etat_proces
 
 			free(executable_candidat);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rplpp",
-					d_exec_path) < 0)
+			if (alsprintf(s_etat_processus, &executable_candidat,
+					"%s/bin/rplpp", d_exec_path) < 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 				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);
@@ -207,22 +186,15 @@ chainage(struct_processus *s_etat_proces
 
 			free(executable_candidat);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rplawk",
-					d_exec_path) < 0)
+			if (alsprintf(s_etat_processus, &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)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplawk") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -256,22 +228,15 @@ chainage(struct_processus *s_etat_proces
 					(*s_etat_processus).rpl_home,
 					d_locale, nom_fichier_temporaire);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
-					(*s_etat_processus).rpl_home) < 0)
+			if (alsprintf(s_etat_processus, &executable_candidat,
+					"%s/bin/rpliconv", (*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",
-					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);
@@ -279,22 +244,15 @@ chainage(struct_processus *s_etat_proces
 
 			free(executable_candidat);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rplfile",
-					(*s_etat_processus).rpl_home) < 0)
+			if (alsprintf(s_etat_processus, &executable_candidat,
+					"%s/bin/rplfile", (*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",
-					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);
@@ -302,22 +260,15 @@ chainage(struct_processus *s_etat_proces
 
 			free(executable_candidat);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rplpp",
-					(*s_etat_processus).rpl_home) < 0)
+			if (alsprintf(s_etat_processus, &executable_candidat,
+					"%s/bin/rplpp", (*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",
-					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);
@@ -325,22 +276,15 @@ chainage(struct_processus *s_etat_proces
 
 			free(executable_candidat);
 
-			if (alsprintf(&executable_candidat, "%s/bin/rplawk",
-					(*s_etat_processus).rpl_home) < 0)
+			if (alsprintf(s_etat_processus, &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)
+			if (controle_integrite(s_etat_processus, executable_candidat,
+					"rplawk") != d_vrai)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_somme_controle;
 				return(d_erreur);
@@ -389,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)
 		{
@@ -472,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)
 						{
@@ -509,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)
 		{
@@ -543,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);
@@ -568,7 +513,7 @@ chainage(struct_processus *s_etat_proces
 */
 
 unsigned char *
-compactage(unsigned char *chaine)
+compactage(struct_processus *s_etat_processus, unsigned char *chaine)
 {
 	logical1		drapeau_fin;
 	logical1		presence_chaine;