rpl/src/instructions_t2.c - diff

Return to instructions_t2.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_t2.c between versions 1.1 and 1.22.2.3

version 1.1, 2010/01/26 15:22:45	version 1.22.2.3, 2011/05/09 13:52:22
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.9	RPL/2 (R) version 4.0.24
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 20	Line 20
*/	*/


#include "rpl.conv.h"	#include "rpl-conv.h"


/*	/*
Line 857 instruction_time(struct_processus *s_eta	Line 857 instruction_time(struct_processus *s_eta
* Lecture des différents temps	* Lecture des différents temps
*/	*/

	# ifndef OS2
if ((getrusage(RUSAGE_SELF, &s_usage_processus_pere)) != 0)	if ((getrusage(RUSAGE_SELF, &s_usage_processus_pere)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 868 instruction_time(struct_processus *s_eta	Line 869 instruction_time(struct_processus *s_eta
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
	# else
	s_usage_processus_pere.ru_utime.tv_sec = 0;
	s_usage_processus_pere.ru_utime.tv_usec = 0;
	s_usage_processus_pere.ru_stime.tv_sec = 0;
	s_usage_processus_pere.ru_stime.tv_usec = 0;
	s_usage_processus_fils.ru_utime.tv_sec = 0;
	s_usage_processus_fils.ru_utime.tv_usec = 0;
	s_usage_processus_fils.ru_stime.tv_sec = 0;
	s_usage_processus_fils.ru_stime.tv_usec = 0;
	# endif

/*	/*
* Initialisation de la liste	* Initialisation de la liste
Line 1914 instruction_target(struct_processus *s_e	Line 1925 instruction_target(struct_processus *s_e
.adresse_distante);	.adresse_distante);

if (((((struct_socket ) (*s_objet_argument_1).objet))	if (((((struct_socket ) (*s_objet_argument_1).objet))
.adresse_distante = malloc((strlen((unsigned char *)	.adresse_distante = transliteration(s_etat_processus,
(s_objet_argument_2).objet) + 1) sizeof(unsigned char)))	(unsigned char ) (s_objet_argument_2).objet,
== NULL)	d_locale, "UTF-8")) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

return;	return;
}	}

strcpy((((struct_socket ) (*s_objet_argument_1).objet))
.adresse_distante, (unsigned char *)
(*s_objet_argument_2).objet);
}	}
else if ((*s_objet_argument_2).type == LST)	else if ((*s_objet_argument_2).type == LST)
{	{
Line 2154 instruction_target(struct_processus *s_e	Line 2163 instruction_target(struct_processus *s_e
else if ((((struct_socket ) (*s_objet_argument_1).objet))	else if ((((struct_socket ) (*s_objet_argument_1).objet))
.domaine == PF_INET6)	.domaine == PF_INET6)
{ // Résolution du nom en IPv6	{ // Résolution du nom en IPv6
	# ifdef IPV6
resolution_courante = resolution;	resolution_courante = resolution;

while(resolution_courante != NULL)	while(resolution_courante != NULL)
Line 2201 instruction_target(struct_processus *s_e	Line 2211 instruction_target(struct_processus *s_e
(*resolution_courante).ai_addr)).sin6_addr	(*resolution_courante).ai_addr)).sin6_addr
.s6_addr[i]);	.s6_addr[i]);
}	}
	# else
	if ((*s_etat_processus).langue == 'F')
	{
	printf("+++Attention : Support du protocole"
	" IPv6 indisponible\n");
	}
	else
	{
	printf("+++Warning : IPv6 support "
	"unavailable\n");
	}
	# endif
}	}
else	else
{	{

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.1
changed lines
	Added in v.1.22.2.3