--- rpl/src/chainage.c 2010/06/24 10:10:40 1.13 +++ rpl/src/chainage.c 2011/06/22 13:26:57 1.31 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.17 - Copyright (C) 1989-2010 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.0.prerelease.3 + Copyright (C) 1989-2011 Dr. BERTRAND Joël This file is part of RPL/2. @@ -20,7 +20,7 @@ */ -#include "rpl.conv.h" +#include "rpl-conv.h" /* @@ -49,6 +49,7 @@ chainage(struct_processus *s_etat_proces logical1 drapeau_fin; logical1 existence; + logical1 initialisation; logical1 ouverture; logical1 presence_chaine; @@ -57,13 +58,26 @@ chainage(struct_processus *s_etat_proces unsigned char *commande; unsigned char *executable_candidat; - unsigned char *instructions = "sed -e '1,1s/^#!/\\/\\//g' %s | " - "%s/bin/%s | " + +# 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 = BOURNE_SHELL " -c \"" + "%s/bin/%s %s | " + "%s/bin/rpliconv `%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 %s//IGNORE > %s\""; +# endif unsigned long unite_fichier; @@ -107,8 +121,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; @@ -118,10 +132,11 @@ chainage(struct_processus *s_etat_proces } sprintf(commande, instructions, + d_exec_path, ds_preprocesseur, (*s_etat_processus).nom_fichier_source, - d_exec_path, ds_preprocesseur, d_exec_path, d_exec_path, + 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) @@ -191,13 +206,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; @@ -207,12 +246,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) @@ -282,6 +324,29 @@ chainage(struct_processus *s_etat_proces } 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); } if ((f_source = popen(commande, "r")) == NULL) @@ -345,11 +410,43 @@ chainage(struct_processus *s_etat_proces i = 0; drapeau_fin = d_faux; + initialisation = d_vrai; + + /* + * Élimination du sharp-bang si nécessaire et des caractères + * inutiles. Conversion de caractères. + */ while(drapeau_fin == d_faux) { if ((caractere = getc(f_source)) != EOF) { + if (initialisation == d_vrai) + { + if (caractere == '#') + { + if ((caractere = getc(f_source)) != EOF) + { + if (caractere == '!') + { + do + { + caractere = getc(f_source); + } while((caractere != EOF) && + (caractere != + d_code_retour_chariot)); + } + else + { + rewind(f_source); + caractere = getc(f_source); + } + } + } + + initialisation = d_faux; + } + if ((caractere == d_code_retour_chariot) || (caractere == d_code_tabulation) || ((caractere == d_code_espace) &&