rpl/src/chainage.c - diff

Return to chainage.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/chainage.c between versions 1.16 and 1.51

version 1.16, 2010/08/06 15:32:57	version 1.51, 2013/02/27 17:11:39
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.18	RPL/2 (R) version 4.1.13
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2013 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 49 chainage(struct_processus *s_etat_proces	Line 49 chainage(struct_processus *s_etat_proces

logical1 drapeau_fin;	logical1 drapeau_fin;
logical1 existence;	logical1 existence;
	logical1 initialisation;
logical1 ouverture;	logical1 ouverture;
logical1 presence_chaine;	logical1 presence_chaine;

Line 57 chainage(struct_processus *s_etat_proces	Line 58 chainage(struct_processus *s_etat_proces

unsigned char *commande;	unsigned char *commande;
unsigned char *executable_candidat;	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 "	"%s/bin/rpliconv `%s/bin/rplfile "
"-m %s/share/rplfiles -i %s \| awk "	"-m %s/share/rplfiles -i %s \| "
"'{ print $3; }' \| awk -F= "	"%s/bin/rplawk "
	"'{ print $3; }' \| %s/bin/rplawk -F= "
"'{ if ($2 != \"\") printf(\"-f %%s\", "	"'{ if ($2 != \"\") printf(\"-f %%s\", "
"$2); }'` -t %s//IGNORE > %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;	unsigned long unite_fichier;

Line 107 chainage(struct_processus *s_etat_proces	Line 121 chainage(struct_processus *s_etat_proces
{	{
if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +	if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +
(2 * strlen((*s_etat_processus).nom_fichier_source)) +	(2 * strlen((*s_etat_processus).nom_fichier_source)) +
(4 * strlen(d_exec_path)) + strlen(d_locale) +	(6 * strlen(d_exec_path)) + strlen(d_locale) +
strlen(nom_fichier_temporaire) + strlen(instructions) - 13)	strlen(nom_fichier_temporaire) + strlen(instructions) - 21)
* sizeof(unsigned char))) == NULL)	* sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
Line 118 chainage(struct_processus *s_etat_proces	Line 132 chainage(struct_processus *s_etat_proces
}	}

sprintf(commande, instructions,	sprintf(commande, instructions,
	d_exec_path, ds_preprocesseur,
(*s_etat_processus).nom_fichier_source,	(*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_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",	if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
d_exec_path) < 0)	d_exec_path) < 0)
Line 130 chainage(struct_processus *s_etat_proces	Line 145 chainage(struct_processus *s_etat_proces
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "md5",	if (controle_integrite(s_etat_processus, executable_candidat,
rpliconv_md5) != d_vrai)	"rpliconv") != 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)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
Line 153 chainage(struct_processus *s_etat_proces	Line 161 chainage(struct_processus *s_etat_proces
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "md5",	if (controle_integrite(s_etat_processus, executable_candidat,
rplfile_md5) != d_vrai)	"rplfile") != 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)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
Line 176 chainage(struct_processus *s_etat_proces	Line 177 chainage(struct_processus *s_etat_proces
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "md5",	if (controle_integrite(s_etat_processus, executable_candidat,
rplpp_md5) != d_vrai)	"rplpp") != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "sha1",	free(executable_candidat);
rplpp_sha1) != d_vrai)
	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_integrite(s_etat_processus, executable_candidat,
	"rplawk") != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
Line 196 chainage(struct_processus *s_etat_proces	Line 206 chainage(struct_processus *s_etat_proces
{	{
if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +	if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +
(2 * strlen((*s_etat_processus).nom_fichier_source)) +	(2 * strlen((*s_etat_processus).nom_fichier_source)) +
(4 * strlen((*s_etat_processus).rpl_home)) +	(6 * strlen((*s_etat_processus).rpl_home)) +
strlen(nom_fichier_temporaire) + strlen(instructions) - 11)	strlen(d_locale) +
	strlen(nom_fichier_temporaire) + strlen(instructions) - 21)
* sizeof(unsigned char))) == NULL)	* sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
Line 207 chainage(struct_processus *s_etat_proces	Line 218 chainage(struct_processus *s_etat_proces
}	}

sprintf(commande, instructions,	sprintf(commande, instructions,
(*s_etat_processus).nom_fichier_source,
(*s_etat_processus).rpl_home, ds_preprocesseur,	(*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).rpl_home,
(*s_etat_processus).nom_fichier_source,	(*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",	if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
(*s_etat_processus).rpl_home) < 0)	(*s_etat_processus).rpl_home) < 0)
Line 221 chainage(struct_processus *s_etat_proces	Line 235 chainage(struct_processus *s_etat_proces
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "md5",	if (controle_integrite(s_etat_processus, executable_candidat,
rpliconv_md5) != d_vrai)	"rpliconv") != 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)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
Line 244 chainage(struct_processus *s_etat_proces	Line 251 chainage(struct_processus *s_etat_proces
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "md5",	if (controle_integrite(s_etat_processus, executable_candidat,
rplfile_md5) != d_vrai)	"rplfile") != 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)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
Line 267 chainage(struct_processus *s_etat_proces	Line 267 chainage(struct_processus *s_etat_proces
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "md5",	if (controle_integrite(s_etat_processus, executable_candidat,
rplpp_md5) != d_vrai)	"rplpp") != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
}	}

if (controle(s_etat_processus, executable_candidat, "sha1",	free(executable_candidat);
rplpp_sha1) != d_vrai)
	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_integrite(s_etat_processus, executable_candidat,
	"rplawk") != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
Line 345 chainage(struct_processus *s_etat_proces	Line 354 chainage(struct_processus *s_etat_proces

i = 0;	i = 0;
drapeau_fin = d_faux;	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)	while(drapeau_fin == d_faux)
{	{
if ((caractere = getc(f_source)) != EOF)	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) \|\|	if ((caractere == d_code_retour_chariot) \|\|
(caractere == d_code_tabulation) \|\|	(caractere == d_code_tabulation) \|\|
((caractere == d_code_espace) &&	((caractere == d_code_espace) &&

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.16
changed lines
	Added in v.1.51