--- rpl/src/chainage.c 2012/08/22 10:47:13 1.46 +++ rpl/src/chainage.c 2020/01/10 11:15:41 1.77 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.10 - Copyright (C) 1989-2012 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,8 +138,8 @@ 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); @@ -154,8 +154,8 @@ 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); @@ -170,8 +170,8 @@ 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); @@ -186,8 +186,8 @@ 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); @@ -228,8 +228,8 @@ 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); @@ -244,8 +244,8 @@ 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); @@ -260,8 +260,8 @@ 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); @@ -276,8 +276,8 @@ 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); @@ -333,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) { @@ -416,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) { @@ -453,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) { @@ -487,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); @@ -512,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;