rpl/src/instructions_r3.c - diff

Return to instructions_r3.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_r3.c between versions 1.23.2.3 and 1.42

version 1.23.2.3, 2011/05/09 13:52:20	version 1.42, 2012/04/13 14:12:58
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.24	RPL/2 (R) version 4.1.8
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

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

Line 741 instruction_rnrm(struct_processus *s_eta	Line 741 instruction_rnrm(struct_processus *s_eta
void	void
instruction_rceq(struct_processus *s_etat_processus)	instruction_rceq(struct_processus *s_etat_processus)
{	{
logical1 presence_variable;

long i;

struct_objet *s_objet_variable;	struct_objet *s_objet_variable;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
Line 787 instruction_rceq(struct_processus *s_eta	Line 783 instruction_rceq(struct_processus *s_eta
}	}
}	}

if (recherche_variable(s_etat_processus, "EQ") == d_vrai)	if (recherche_variable_globale(s_etat_processus, "EQ") == d_faux)
{	{
i = (*s_etat_processus).position_variable_courante;	(*s_etat_processus).erreur_systeme = d_es;
presence_variable = d_faux;

while(i >= 0)
{
if ((strcmp((*s_etat_processus).s_liste_variables[i].nom, "EQ")
== 0) && ((*s_etat_processus).s_liste_variables[i]
.niveau == 1))
{
presence_variable = d_vrai;
break;
}

i--;
}

(*s_etat_processus).position_variable_courante = i;

if (presence_variable == d_faux)	if ((*s_etat_processus).erreur_execution == d_ex)
{	{
(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;	(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
return;
}	}

if ((*s_etat_processus).s_liste_variables[i].objet == NULL)
{
(*s_etat_processus).erreur_execution = d_ex_variable_partagee;
return;
}
}
else
{
(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
return;	return;
}	}

if ((s_objet_variable = copie_objet(s_etat_processus,	if ((s_objet_variable = copie_objet(s_etat_processus,
((*s_etat_processus).s_liste_variables)	((s_etat_processus).pointeur_variable_courante).objet, 'P'))
[(*s_etat_processus).position_variable_courante].objet, 'P'))
== NULL)	== NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
Line 1095 instruction_recall(struct_processus *s_e	Line 1063 instruction_recall(struct_processus *s_e
return;	return;
}	}

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;
}

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;	return;
Line 1118 instruction_recall(struct_processus *s_e	Line 1079 instruction_recall(struct_processus *s_e
return;	return;
}	}

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;
}

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;	return;
Line 1141 instruction_recall(struct_processus *s_e	Line 1095 instruction_recall(struct_processus *s_e
return;	return;
}	}

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;
return;
}

if (controle(s_etat_processus, executable_candidat, "sha1",
rplpp_sha1) != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return;	return;
Line 1164 instruction_recall(struct_processus *s_e	Line 1111 instruction_recall(struct_processus *s_e
return;	return;
}	}

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

if (controle(s_etat_processus, executable_candidat, "sha1",
rplawk_sha1) != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return;	return;
Line 1207 instruction_recall(struct_processus *s_e	Line 1147 instruction_recall(struct_processus *s_e
return;	return;
}	}

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;
}

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;	return;
Line 1230 instruction_recall(struct_processus *s_e	Line 1163 instruction_recall(struct_processus *s_e
return;	return;
}	}

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;
}

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;	return;
Line 1253 instruction_recall(struct_processus *s_e	Line 1179 instruction_recall(struct_processus *s_e
return;	return;
}	}

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;
return;
}

if (controle(s_etat_processus, executable_candidat, "sha1",
rplpp_sha1) != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return;	return;
Line 1276 instruction_recall(struct_processus *s_e	Line 1195 instruction_recall(struct_processus *s_e
return;	return;
}	}

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

if (controle(s_etat_processus, executable_candidat, "sha1",
rplawk_sha1) != d_vrai)
{	{
(*s_etat_processus).erreur_systeme = d_es_somme_controle;	(*s_etat_processus).erreur_systeme = d_es_somme_controle;
return;	return;
Line 1698 instruction_rcws(struct_processus *s_eta	Line 1610 instruction_rcws(struct_processus *s_eta
void	void
instruction_rcls(struct_processus *s_etat_processus)	instruction_rcls(struct_processus *s_etat_processus)
{	{
logical1 presence_variable;

long i;

struct_objet *s_objet_variable;	struct_objet *s_objet_variable;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
Line 1742 instruction_rcls(struct_processus *s_eta	Line 1650 instruction_rcls(struct_processus *s_eta
}	}
}	}

if (recherche_variable(s_etat_processus, ds_sdat) == d_vrai)	if (recherche_variable_globale(s_etat_processus, ds_sdat) == d_faux)
{	{
i = (*s_etat_processus).position_variable_courante;	(*s_etat_processus).erreur_systeme = d_es;
presence_variable = d_faux;

while(i >= 0)
{
if ((strcmp((*s_etat_processus).s_liste_variables[i].nom, ds_sdat)
== 0) && ((*s_etat_processus).s_liste_variables[i]
.niveau == 1))
{
presence_variable = d_vrai;
break;
}

i--;
}

(*s_etat_processus).position_variable_courante = i;

if (presence_variable == d_faux)	if ((*s_etat_processus).erreur_execution == d_ex)
{	{
(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;	(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
return;
}	}

if ((*s_etat_processus).s_liste_variables[i].objet == NULL)
{
(*s_etat_processus).erreur_execution = d_ex_variable_partagee;
return;
}
}
else
{
(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex_variable_non_definie;
return;	return;
}	}

if ((s_objet_variable = copie_objet(s_etat_processus,	if ((s_objet_variable = copie_objet(s_etat_processus,
((*s_etat_processus).s_liste_variables)	((s_etat_processus).pointeur_variable_courante).objet, 'O'))
[(*s_etat_processus).position_variable_courante].objet, 'O'))
== NULL)	== NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.23.2.3
changed lines
	Added in v.1.42