rpl/src/rpl.c - diff

Return to rpl.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.c between versions 1.49 and 1.78

version 1.49, 2010/09/06 16:50:17	version 1.78, 2011/08/30 14:19:28
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.19	RPL/2 (R) version 4.1.3
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2011 Dr. BERTRAND Joël

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

Line 46 rplinit(int argc, char *argv[], unsigned	Line 46 rplinit(int argc, char *argv[], unsigned

int erreur_historique;	int erreur_historique;
int option_P;	int option_P;
int status;

logical1 core;	logical1 core;
logical1 debug;	logical1 debug;
Line 183 rplinit(int argc, char *argv[], unsigned	Line 182 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).langue = 'E';	(*s_etat_processus).langue = 'E';
}	}

	initialisation_contexte_cas(s_etat_processus);

(*s_etat_processus).exception = d_ep;	(*s_etat_processus).exception = d_ep;
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
Line 307 rplinit(int argc, char *argv[], unsigned	Line 308 rplinit(int argc, char *argv[], unsigned

if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
printf("+++Copyright (C) 1989 à 2009, 2010 BERTRAND Joël\n");	printf("+++Copyright (C) 1989 à 2010, 2011 BERTRAND Joël\n");
}	}
else	else
{	{
printf("+++Copyright (C) 1989 to 2009, 2010 BERTRAND Joel\n");	printf("+++Copyright (C) 1989 to 2010, 2011 BERTRAND Joel\n");
}	}

if (getenv("HOME") != NULL)	if (getenv("HOME") != NULL)
Line 419 rplinit(int argc, char *argv[], unsigned	Line 420 rplinit(int argc, char *argv[], unsigned
# else	# else
action.sa_handler = interruption1;	action.sa_handler = interruption1;
# endif	# endif
action.sa_flags = SA_ONSTACK \| SA_SIGINFO \| SA_NODEFER;	action.sa_flags = SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGINT, &action, NULL) != 0)	if (sigaction(SIGINT, &action, NULL) != 0)
{	{
Line 438 rplinit(int argc, char *argv[], unsigned	Line 439 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

	if (sigaction(SIGTERM, &action, NULL) != 0)
	{
	erreur = d_es_signal;

	if ((*s_etat_processus).langue == 'F')
	{
	printf("+++Système : Initialisation des signaux POSIX "
	"impossible\n");
	}
	else
	{
	printf("+++System : Initialization of POSIX signals failed\n");
	}

	return(EXIT_FAILURE);
	}

# ifndef _BROKEN_SIGINFO	# ifndef _BROKEN_SIGINFO
action.sa_sigaction = interruption2;	action.sa_sigaction = interruption2;
# else	# else
Line 465 rplinit(int argc, char *argv[], unsigned	Line 483 rplinit(int argc, char *argv[], unsigned
# else	# else
action.sa_handler = interruption4;	action.sa_handler = interruption4;
# endif	# endif
action.sa_flags = SA_ONSTACK \| SA_SIGINFO \| SA_NODEFER;	// SIGCONT ne doit pas pouvoir être appelé depuis son gestionnaire.
	action.sa_flags = SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGSTART, &action, NULL) != 0)	if (sigaction(SIGSTART, &action, NULL) != 0)
{	{
Line 1599 rplinit(int argc, char *argv[], unsigned	Line 1618 rplinit(int argc, char *argv[], unsigned
# else	# else
action.sa_handler = interruption10;	action.sa_handler = interruption10;
# endif	# endif
action.sa_flags = SA_ONSTACK \| SA_SIGINFO \| SA_NODEFER;	action.sa_flags = SA_ONSTACK \| SA_SIGINFO;

if (sigaction(SIGHUP, &action, NULL) != 0)	if (sigaction(SIGHUP, &action, NULL) != 0)
{	{
Line 1815 rplinit(int argc, char *argv[], unsigned	Line 1834 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).affichage_arguments = 'N';	(*s_etat_processus).affichage_arguments = 'N';
(*s_etat_processus).autorisation_conversion_chaine = 'Y';	(*s_etat_processus).autorisation_conversion_chaine = 'Y';
(*s_etat_processus).autorisation_evaluation_nom = 'Y';	(*s_etat_processus).autorisation_evaluation_nom = 'Y';
(*s_etat_processus).autorisation_nom_implicite = 'Y';
	if (mode_interactif == d_vrai)
	{
	(*s_etat_processus).autorisation_nom_implicite = 'Y';
	}
	else
	{
	(*s_etat_processus).autorisation_nom_implicite = 'N';
	}

(*s_etat_processus).autorisation_empilement_programme = 'N';	(*s_etat_processus).autorisation_empilement_programme = 'N';
(*s_etat_processus).requete_arret = 'N';	(*s_etat_processus).requete_arret = 'N';
(*s_etat_processus).evaluation_forcee = 'N';	(*s_etat_processus).evaluation_forcee = 'N';
	(*s_etat_processus).recherche_type = 'N';

(*s_etat_processus).constante_symbolique = 'N';	(*s_etat_processus).constante_symbolique = 'N';
(*s_etat_processus).traitement_symbolique = 'N';	(*s_etat_processus).traitement_symbolique = 'N';
Line 1829 rplinit(int argc, char *argv[], unsigned	Line 1858 rplinit(int argc, char *argv[], unsigned

(*s_etat_processus).l_base_pile = NULL;	(*s_etat_processus).l_base_pile = NULL;
(*s_etat_processus).l_base_pile_last = NULL;	(*s_etat_processus).l_base_pile_last = NULL;
	(*s_etat_processus).l_base_pile_undo = NULL;

(*s_etat_processus).s_liste_variables = NULL;	(*s_etat_processus).s_arbre_variables = NULL;
	(*s_etat_processus).l_liste_variables_par_niveau = NULL;
(*s_etat_processus).gel_liste_variables = d_faux;	(*s_etat_processus).gel_liste_variables = d_faux;
(*s_etat_processus).nombre_variables = 0;	(*s_etat_processus).pointeur_variable_courante = NULL;
(*s_etat_processus).nombre_variables_allouees = 0;
(*s_etat_processus).s_liste_variables_statiques = NULL;	(*s_etat_processus).s_liste_variables_statiques = NULL;
(*s_etat_processus).nombre_variables_statiques = 0;	(*s_etat_processus).nombre_variables_statiques = 0;
(*s_etat_processus).nombre_variables_statiques_allouees = 0;	(*s_etat_processus).nombre_variables_statiques_allouees = 0;
Line 1841 rplinit(int argc, char *argv[], unsigned	Line 1871 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).niveau_initial = 0;	(*s_etat_processus).niveau_initial = 0;
(*s_etat_processus).creation_variables_statiques = d_faux;	(*s_etat_processus).creation_variables_statiques = d_faux;
(*s_etat_processus).creation_variables_partagees = d_faux;	(*s_etat_processus).creation_variables_partagees = d_faux;
(*s_etat_processus).position_variable_courante = 0;
(*s_etat_processus).position_variable_statique_courante = 0;	(*s_etat_processus).position_variable_statique_courante = 0;

(*s_etat_processus).s_bibliotheques = NULL;	(*s_etat_processus).s_bibliotheques = NULL;
Line 1987 rplinit(int argc, char *argv[], unsigned	Line 2016 rplinit(int argc, char *argv[], unsigned

initialisation_allocateur(s_etat_processus);	initialisation_allocateur(s_etat_processus);
initialisation_drapeaux(s_etat_processus);	initialisation_drapeaux(s_etat_processus);
	initialisation_variables(s_etat_processus);
	initialisation_instructions(s_etat_processus);

if ((*s_etat_processus).erreur_systeme != d_es)	if ((*s_etat_processus).erreur_systeme != d_es)
{	{
Line 2372 rplinit(int argc, char *argv[], unsigned	Line 2403 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).position_courante = 0;	(*s_etat_processus).position_courante = 0;
(*s_etat_processus).traitement_cycle_exit = 'N';	(*s_etat_processus).traitement_cycle_exit = 'N';

if ((*s_etat_processus).nombre_variables == 0)	if ((*s_etat_processus).s_arbre_variables == NULL)
{	{
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
Line 2432 rplinit(int argc, char *argv[], unsigned	Line 2463 rplinit(int argc, char *argv[], unsigned
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

if ((*s_etat_processus).s_liste_variables	if (((s_etat_processus).pointeur_variable_courante)
[(*s_etat_processus)	.niveau != 0)
.position_variable_courante].niveau != 0)
{	{
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
Line 2520 rplinit(int argc, char *argv[], unsigned	Line 2550 rplinit(int argc, char *argv[], unsigned

fflush(stdout);	fflush(stdout);

initialisation_instructions(s_etat_processus);

if (arguments != NULL)	if (arguments != NULL)
{	{
tampon = (*s_etat_processus).definitions_chainees;	tampon = (*s_etat_processus).definitions_chainees;
Line 2965 rplinit(int argc, char *argv[], unsigned	Line 2993 rplinit(int argc, char *argv[], unsigned

while((*s_etat_processus).l_base_pile_processus != NULL)	while((*s_etat_processus).l_base_pile_processus != NULL)
{	{
status = 0;

l_element_courant = (void *)	l_element_courant = (void *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;

Line 3190 rplinit(int argc, char *argv[], unsigned	Line 3216 rplinit(int argc, char *argv[], unsigned
* le libérer...	* le libérer...
*/	*/

for(i = 0; i < (*s_etat_processus).nombre_variables; i++)	liberation_arbre_variables(s_etat_processus,
{	(*s_etat_processus).s_arbre_variables, d_vrai);
liberation(s_etat_processus,	free((*s_etat_processus).pointeurs_caracteres_variables);
(*s_etat_processus).s_liste_variables[i].objet);
free((*s_etat_processus).s_liste_variables[i].nom);
}

free((*s_etat_processus).s_liste_variables);

for(i = 0; i < (*s_etat_processus)	for(i = 0; i < (*s_etat_processus)
.nombre_variables_statiques; i++)	.nombre_variables_statiques; i++)
Line 3375 rplinit(int argc, char *argv[], unsigned	Line 3396 rplinit(int argc, char *argv[], unsigned
}	}

l_element_courant = (void ) (s_etat_processus)	l_element_courant = (void ) (s_etat_processus)
	.l_base_pile_undo;
	while(l_element_courant != NULL)
	{
	l_element_suivant = (((struct_liste_chainee )
	l_element_courant)).suivant;

	liberation(s_etat_processus,
	(((struct_liste_chainee )
	l_element_courant)).donnee);
	free((struct_liste_chainee *) l_element_courant);

	l_element_courant = l_element_suivant;
	}

	l_element_courant = (void ) (s_etat_processus)
.l_base_pile_systeme;	.l_base_pile_systeme;
while(l_element_courant != NULL)	while(l_element_courant != NULL)
{	{
Line 3556 rplinit(int argc, char *argv[], unsigned	Line 3592 rplinit(int argc, char *argv[], unsigned
}	}
}	}

# if !defined(Cygwin) && !defined(OpenBSD)
(*s_etat_processus).pile_signal.ss_flags = SS_DISABLE;
sigaltstack(&((*s_etat_processus).pile_signal), NULL);
free((*s_etat_processus).pile_signal.ss_sp);
# endif

closelog();	closelog();

pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));	pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));
Line 3604 rplinit(int argc, char *argv[], unsigned	Line 3634 rplinit(int argc, char *argv[], unsigned
# undef return	# undef return
# endif	# endif

	liberation_contexte_cas(s_etat_processus);

free((*s_etat_processus).chemin_fichiers_temporaires);	free((*s_etat_processus).chemin_fichiers_temporaires);
free(s_etat_processus);	free(s_etat_processus);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.49
changed lines
	Added in v.1.78