rpl/src/instructions_r4.c - diff

Return to instructions_r4.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_r4.c between versions 1.107 and 1.118

version 1.107, 2018/12/24 15:56:23	version 1.118, 2023/11/24 10:48:21
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.30	RPL/2 (R) version 4.1.35
Copyright (C) 1989-2018 Dr. BERTRAND Joël	Copyright (C) 1989-2023 Dr. BERTRAND Joël

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

Line 962 instruction_read(struct_processus *s_eta	Line 962 instruction_read(struct_processus *s_eta
printf("(read a record of a file)\n\n");	printf("(read a record of a file)\n\n");
}	}

printf(" 1: %s, %s\n\n", d_FCH, d_SCK);	printf(" 1: %s, %s\n", d_FCH, d_SCK);
	printf("-> 1: %s\n\n", d_LST);

printf(" 2: %s, %s\n", d_INT, d_CHN);	printf(" 2: %s, %s\n", d_INT, d_CHN);
printf(" 1: %s\n", d_FCH);	printf(" 1: %s\n", d_FCH);
	printf("-> 1: %s\n\n", d_LST);
return;	return;
}	}
else if ((*s_etat_processus).test_instruction == 'Y')	else if ((*s_etat_processus).test_instruction == 'Y')
Line 2120 instruction_read(struct_processus *s_eta	Line 2122 instruction_read(struct_processus *s_eta
if (sscanf(&(format_chaine[8]), "%lld", &longueur)	if (sscanf(&(format_chaine[8]), "%lld", &longueur)
!= 1)	!= 1)
{	{
liberation(s_etat_processus, s_objet_argument_1);	liberation(s_etat_processus,
	s_objet_argument_1);
liberation(s_etat_processus, s_objet_resultat);	liberation(s_etat_processus, s_objet_resultat);
free(format_chaine);	free(format_chaine);

Line 2533 instruction_read(struct_processus *s_eta	Line 2536 instruction_read(struct_processus *s_eta
}	}

// Une donnée a été reçue.	// Une donnée a été reçue.
	// Attention : on peut TOUJOURS recevoir 0
	// indiquant que la socket est close.

if (ios >= 0)	if (ios >= 0)
{	{
Line 2540 instruction_read(struct_processus *s_eta	Line 2545 instruction_read(struct_processus *s_eta
position_initiale = 0;	position_initiale = 0;
presence_indicateur = d_faux;	presence_indicateur = d_faux;

do	if (ios > 0)
{	{
if (tampon_lecture[position_initiale] == '{')	do
{	{
presence_indicateur = d_vrai;	if (tampon_lecture[position_initiale] == '{')
break;	{
}	presence_indicateur = d_vrai;
	break;
	}

position_initiale++;	position_initiale++;
} while(position_initiale < longueur_effective);	} while(position_initiale < longueur_effective);
	}
	else
	{
	presence_indicateur = d_vrai;
	}

if (presence_indicateur == d_vrai)	if (presence_indicateur == d_vrai)
{	{
position_finale = position_initiale + 1;	position_finale = position_initiale + 1;
presence_chaine = d_faux;	presence_chaine = d_faux;
presence_indicateur = d_faux;	presence_indicateur = d_faux;
niveau = 1;	niveau = 0;

while(position_finale < longueur_effective)	while(position_finale < longueur_effective)
{	{
Line 2564 instruction_read(struct_processus *s_eta	Line 2576 instruction_read(struct_processus *s_eta

if (caractere == '"')	if (caractere == '"')
{	{
if (position_finale > 0)	if (tampon_lecture[position_finale - 1]
{	!= '\\')
if (tampon_lecture[position_finale - 1]
!= '\\')
{
presence_chaine = (presence_chaine ==
d_vrai) ? d_faux : d_vrai;
}
}
else
{	{
presence_chaine =	presence_chaine = (presence_chaine ==
(presence_chaine == d_vrai)	d_vrai) ? d_faux : d_vrai;
? d_faux : d_vrai;
}	}
}	}
else	else
Line 2782 instruction_read(struct_processus *s_eta	Line 2785 instruction_read(struct_processus *s_eta
}	}
} while(trame_complete == d_faux);	} while(trame_complete == d_faux);

tampon_lecture[++position_finale] = d_code_fin_chaine;
tampon = (*s_etat_processus).instruction_courante;	tampon = (*s_etat_processus).instruction_courante;
(*s_etat_processus).instruction_courante = tampon_lecture;	(*s_etat_processus).instruction_courante = tampon_lecture;

Line 3176 instruction_read(struct_processus *s_eta	Line 3178 instruction_read(struct_processus *s_eta
return;	return;
}	}

if (ios <= 0)	if (ios < 0)
{	{
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);
Line 3207 instruction_read(struct_processus *s_eta	Line 3209 instruction_read(struct_processus *s_eta
position_initiale = 0;	position_initiale = 0;
presence_indicateur = d_faux;	presence_indicateur = d_faux;
}	}
else if (ios > 0)	else if (ios >= 0)
{	{
// On retire une trame du buffer.	// On retire une trame du buffer.

Line 3546 instruction_read(struct_processus *s_eta	Line 3548 instruction_read(struct_processus *s_eta

do	do
{	{
if ((tampon_lecture = malloc((((long long unsigned int)	if ((tampon_lecture = malloc((((size_t) longueur_questure) + 1)
longueur_questure) + 1) *	* sizeof(unsigned char))) == NULL)
sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 3728 instruction_read(struct_processus *s_eta	Line 3729 instruction_read(struct_processus *s_eta
return;	return;
}	}

if (((*s_objet_type).objet = malloc((long long unsigned int)	if (((*s_objet_type).objet = malloc((size_t) longueur_enregistrement
longueur_enregistrement *	* 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;
return;	return;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.107
changed lines
	Added in v.1.118