rpl/src/transliteration.c - diff

Return to transliteration.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/transliteration.c between versions 1.40 and 1.49

version 1.40, 2011/09/14 17:56:00	version 1.49, 2012/01/17 14:44:13
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.3	RPL/2 (R) version 4.1.6
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 181 localisation_courante(struct_processus *	Line 181 localisation_courante(struct_processus *

pid_t pid;	pid_t pid;

sigset_t oldset;
sigset_t set;

struct sigaction action_passee;	struct sigaction action_passee;

unsigned char *tampon;	unsigned char *tampon;
Line 234 localisation_courante(struct_processus *	Line 231 localisation_courante(struct_processus *
return;	return;
}	}

sigfillset(&set);
pthread_sigmask(SIG_BLOCK, &set, &oldset);

verrouillage_threads_concurrents(s_etat_processus);	verrouillage_threads_concurrents(s_etat_processus);
pid = fork();	pid = fork();
deverrouillage_threads_concurrents(s_etat_processus);	deverrouillage_threads_concurrents(s_etat_processus);

pthread_sigmask(SIG_SETMASK, &oldset, NULL);
sigpending(&set);

if (pid < 0)	if (pid < 0)
{	{
if (close(pipes_entree[0]) != 0)	if (close(pipes_entree[0]) != 0)
Line 405 localisation_courante(struct_processus *	Line 396 localisation_courante(struct_processus *
* Récupération de la valeur de retour du processus détaché	* Récupération de la valeur de retour du processus détaché
*/	*/

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 413 localisation_courante(struct_processus *	Line 408 localisation_courante(struct_processus *

if (waitpid(pid, &status, 0) == -1)	if (waitpid(pid, &status, 0) == -1)
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}
} while((!WIFEXITED(status)) && (!WIFSIGNALED(status)));	} while((!WIFEXITED(status)) && (!WIFSIGNALED(status)));

Line 443 localisation_courante(struct_processus *	Line 452 localisation_courante(struct_processus *

tampon[0] = d_code_fin_chaine;	tampon[0] = d_code_fin_chaine;

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 453 localisation_courante(struct_processus *	Line 466 localisation_courante(struct_processus *
pipes_sortie[0], &(tampon[pointeur]),	pipes_sortie[0], &(tampon[pointeur]),
longueur_lecture)) > 0)	longueur_lecture)) > 0)
{	{
if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

tampon[pointeur + ios] = d_code_fin_chaine;	tampon[pointeur + ios] = d_code_fin_chaine;
Line 472 localisation_courante(struct_processus *	Line 492 localisation_courante(struct_processus *
return;	return;
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (strlen(tampon) == 0)	if (strlen(tampon) == 0)
Line 542 localisation_courante(struct_processus *	Line 573 localisation_courante(struct_processus *

free(arguments);	free(arguments);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 564 localisation_courante(struct_processus *	Line 599 localisation_courante(struct_processus *
strcpy((*s_etat_processus).localisation, d_locale);	strcpy((*s_etat_processus).localisation, d_locale);
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (close(pipes_erreur[0]) != 0)	if (close(pipes_erreur[0]) != 0)
Line 633 transliterated_fprintf(struct_processus	Line 675 transliterated_fprintf(struct_processus
}	}

# ifdef OS2	# ifdef OS2
if ((flux == stdin) \|\| (flux == stdout))	if ((flux == stderr) \|\| (flux == stdout))
{	{
i = 0;	i = 0;
ptr_l = tampon2;	ptr_l = tampon2;
Line 652 transliterated_fprintf(struct_processus	Line 694 transliterated_fprintf(struct_processus
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(NULL);	return(-1);
}	}

ptr_e = tampon3;	ptr_e = tampon3;

CVSweb interface <joel.bertrand@systella.fr>

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