rpl/src/instructions_s1.c - diff

Return to instructions_s1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s1.c between versions 1.47 and 1.55

version 1.47, 2012/04/13 14:12:59	version 1.55, 2012/10/01 11:05:06
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.8	RPL/2 (R) version 4.1.11
Copyright (C) 1989-2012 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 2572 instruction_start(struct_processus *s_et	Line 2572 instruction_start(struct_processus *s_et
}	}
}	}

empilement_pile_systeme(s_etat_processus);

if ((*s_etat_processus).erreur_systeme != d_es)
{
return;
}

((s_etat_processus).l_base_pile_systeme).type_cloture = 'S';

if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),	if (depilement(s_etat_processus, &((*s_etat_processus).l_base_pile),
&s_objet_1) == d_erreur)	&s_objet_1) == d_erreur)
{	{
Line 2614 instruction_start(struct_processus *s_et	Line 2605 instruction_start(struct_processus *s_et
return;	return;
}	}

	empilement_pile_systeme(s_etat_processus);

	if ((*s_etat_processus).erreur_systeme != d_es)
	{
	return;
	}

	((s_etat_processus).l_base_pile_systeme).type_cloture = 'S';

((s_etat_processus).l_base_pile_systeme).indice_boucle = s_objet_2;	((s_etat_processus).l_base_pile_systeme).indice_boucle = s_objet_2;
((s_etat_processus).l_base_pile_systeme).limite_indice_boucle = s_objet_1;	((s_etat_processus).l_base_pile_systeme).limite_indice_boucle = s_objet_1;

Line 3399 instruction_syseval(struct_processus *s_	Line 3399 instruction_syseval(struct_processus *s_
logical1 presence_stdin;	logical1 presence_stdin;

long i;	long i;
	long longueur_ecriture;
	long longueur_traitee;
long nombre_arguments;	long nombre_arguments;

pid_t pid;	pid_t pid;

ssize_t longueur_ecriture;

struct_liste_chainee *l_element_courant;	struct_liste_chainee *l_element_courant;
struct_liste_chainee *l_element_precedent;	struct_liste_chainee *l_element_precedent;
struct_liste_chainee *l_element_stdin;	struct_liste_chainee *l_element_stdin;
Line 3417 instruction_syseval(struct_processus *s_	Line 3417 instruction_syseval(struct_processus *s_
struct sigaction action_courante;	struct sigaction action_courante;
struct sigaction action_passee;	struct sigaction action_passee;

	unsigned char *ligne;
unsigned char *ptr;	unsigned char *ptr;
unsigned char *ptr2;	unsigned char *ptr2;
unsigned char registre_autorisation_empilement_programme;	unsigned char registre_autorisation_empilement_programme;
Line 3523 instruction_syseval(struct_processus *s_	Line 3524 instruction_syseval(struct_processus *s_
registre_programme = (*s_etat_processus).definitions_chainees;	registre_programme = (*s_etat_processus).definitions_chainees;
registre_position_courante = (*s_etat_processus).position_courante;	registre_position_courante = (*s_etat_processus).position_courante;

(*s_etat_processus).definitions_chainees =
(unsigned char ) (s_objet).objet;
(*s_etat_processus).position_courante = 0;	(*s_etat_processus).position_courante = 0;
(*s_etat_processus).autorisation_empilement_programme = 'N';	(*s_etat_processus).autorisation_empilement_programme = 'N';

Line 3532 instruction_syseval(struct_processus *s_	Line 3531 instruction_syseval(struct_processus *s_
* Échappement des guillemets	* Échappement des guillemets
*/	*/

ptr = (*s_etat_processus).definitions_chainees;	if (((*s_etat_processus).definitions_chainees =
ptr2 = ptr;	formateur_flux(s_etat_processus, (unsigned char *)
i = 0;	(*s_objet).objet, &longueur_traitee)) == NULL)

while((*ptr) != d_code_fin_chaine)
{	{
if ((*ptr) == '\\')	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
{	return;
switch (*(ptr + 1))
{
case '"':
case '\\':
{
ptr++;
break;
}
}
}

ptr2++ = ptr++;
}	}

*ptr2 = d_code_fin_chaine;

/*	/*
* Scission de la chaîne en différents arguments	* Scission de la chaîne en différents arguments
*/	*/
Line 3567 instruction_syseval(struct_processus *s_	Line 3550 instruction_syseval(struct_processus *s_
{	{
if (recherche_instruction_suivante(s_etat_processus) == d_erreur)	if (recherche_instruction_suivante(s_etat_processus) == d_erreur)
{	{
	free((*s_etat_processus).definitions_chainees);

(*s_etat_processus).autorisation_empilement_programme =	(*s_etat_processus).autorisation_empilement_programme =
registre_autorisation_empilement_programme;	registre_autorisation_empilement_programme;
(*s_etat_processus).instruction_courante =	(*s_etat_processus).instruction_courante =
Line 3584 instruction_syseval(struct_processus *s_	Line 3569 instruction_syseval(struct_processus *s_
if ((s_objet_temporaire = allocation(s_etat_processus, CHN))	if ((s_objet_temporaire = allocation(s_etat_processus, CHN))
== NULL)	== NULL)
{	{
	free((*s_etat_processus).definitions_chainees);

(*s_etat_processus).autorisation_empilement_programme =	(*s_etat_processus).autorisation_empilement_programme =
registre_autorisation_empilement_programme;	registre_autorisation_empilement_programme;
(*s_etat_processus).instruction_courante =	(*s_etat_processus).instruction_courante =
Line 3628 instruction_syseval(struct_processus *s_	Line 3615 instruction_syseval(struct_processus *s_
&((*s_etat_processus).l_base_pile),	&((*s_etat_processus).l_base_pile),
s_objet_temporaire) == d_erreur)	s_objet_temporaire) == d_erreur)
{	{
	free((*s_etat_processus).definitions_chainees);

	(*s_etat_processus).autorisation_empilement_programme =
	registre_autorisation_empilement_programme;
	(*s_etat_processus).instruction_courante =
	registre_instruction_courante;
	(*s_etat_processus).definitions_chainees =
	registre_programme;
	(*s_etat_processus).position_courante =
	registre_position_courante;
return;	return;
}	}
}	}
Line 3640 instruction_syseval(struct_processus *s_	Line 3637 instruction_syseval(struct_processus *s_
nombre_arguments++;	nombre_arguments++;
} while(drapeau_fin == d_faux);	} while(drapeau_fin == d_faux);

	free((*s_etat_processus).definitions_chainees);

(*s_etat_processus).autorisation_empilement_programme =	(*s_etat_processus).autorisation_empilement_programme =
registre_autorisation_empilement_programme;	registre_autorisation_empilement_programme;
(*s_etat_processus).instruction_courante =	(*s_etat_processus).instruction_courante =
Line 3855 instruction_syseval(struct_processus *s_	Line 3854 instruction_syseval(struct_processus *s_

while(l_element_courant != NULL)	while(l_element_courant != NULL)
{	{
longueur_ecriture = strlen((unsigned char *)	if ((ligne = formateur_flux(s_etat_processus,
((l_element_courant).donnee).objet);	(unsigned char ) ((*l_element_courant).donnee)
	.objet, &longueur_ecriture)) == NULL)
	{
	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
	return;
	}

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork))	if (sem_post(&((*s_etat_processus).semaphore_fork))
Line 3870 instruction_syseval(struct_processus *s_	Line 3875 instruction_syseval(struct_processus *s_
}	}

while(write_atomic(s_etat_processus,	while(write_atomic(s_etat_processus,
pipes_entree[1], (unsigned char *)	pipes_entree[1], ligne,
((l_element_courant).donnee).objet,
longueur_ecriture) != longueur_ecriture)	longueur_ecriture) != longueur_ecriture)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
Line 3906 instruction_syseval(struct_processus *s_	Line 3910 instruction_syseval(struct_processus *s_
}	}
}	}

	free(ligne);

while(write_atomic(s_etat_processus,	while(write_atomic(s_etat_processus,
pipes_entree[1], "\n", 1) != 1)	pipes_entree[1], "\n", 1) != 1)
{	{
Line 4031 instruction_syseval(struct_processus *s_	Line 4037 instruction_syseval(struct_processus *s_
return;	return;
}	}

	tampon[0] = d_code_fin_chaine;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
Line 4092 instruction_syseval(struct_processus *s_	Line 4100 instruction_syseval(struct_processus *s_
}	}
}	}

if ((tampon = realloc(tampon, (strlen(tampon) + 1) *
sizeof(unsigned char))) == NULL)
{
(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;
return;
}

if (ios == -1)	if (ios == -1)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 4164 instruction_syseval(struct_processus *s_	Line 4164 instruction_syseval(struct_processus *s_
}	}

if ((((l_element_courant).donnee).objet =	if ((((l_element_courant).donnee).objet =
malloc((strlen(ptr) + 1) * sizeof(unsigned char)))	analyse_flux(s_etat_processus, ptr,
== NULL)	strlen(ptr))) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
return;	return;
}	}

strcpy(((l_element_courant).donnee).objet, ptr);

while((*ptr) != d_code_fin_chaine)	while((*ptr) != d_code_fin_chaine)
{	{
ptr++;	ptr++;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.47
changed lines
	Added in v.1.55