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.19 and 1.20

version 1.19, 2010/09/07 08:58:04	version 1.20, 2010/09/07 13:31:54
Line 62 chainage(struct_processus *s_etat_proces	Line 62 chainage(struct_processus *s_etat_proces
# ifndef OS2	# ifndef OS2
unsigned char *instructions = "%s/bin/%s %s \| "	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	# else
unsigned char *instructions = "sh -c \""	unsigned char *instructions = "sh -c \""
"%s/bin/%s %s \| "	"%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 \| %s/bin/rplawk "
"'{ print $3; }' \| awk -F= "	"'{ print $3; }' \| %s/bin/rplawk -F= "
"'{ if ($2 != \\\"\\\") "	"'{ if ($2 != \\\"\\\") "
"printf(\\\"-f %%s\\\", "	"printf(\\\"-f %%s\\\", "
"$2); }'` -t %s//IGNORE\" > %s";	"$2); }'` -t %s//IGNORE\" > %s";
Line 119 chainage(struct_processus *s_etat_proces	Line 120 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 134 chainage(struct_processus *s_etat_proces	Line 135 chainage(struct_processus *s_etat_proces
(*s_etat_processus).nom_fichier_source,	(*s_etat_processus).nom_fichier_source,
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 204 chainage(struct_processus *s_etat_proces	Line 205 chainage(struct_processus *s_etat_proces
}	}

free(executable_candidat);	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	else
{	{
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 220 chainage(struct_processus *s_etat_proces	Line 245 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 292 chainage(struct_processus *s_etat_proces	Line 320 chainage(struct_processus *s_etat_proces
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return(d_erreur);	return(d_erreur);
	}

	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);	free(executable_candidat);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.19
changed lines
	Added in v.1.20