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.13 and 1.50

version 1.13, 2010/07/14 14:19:40	version 1.50, 2012/03/01 10:14:09
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.18	RPL/2 (R) version 4.1.7
Copyright (C) 1989-2010 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 20	Line 20
*/	*/


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

#include <stdarg.h>	#include <stdarg.h>

Line 105 reencodage(struct_processus *s_etat_proc	Line 105 reencodage(struct_processus *s_etat_proc

chaine_sortie[0] = d_code_fin_chaine;	chaine_sortie[0] = d_code_fin_chaine;

if ((buffer_sortie = malloc((d_LONGUEUR + 1) * sizeof(char))) == NULL)	if ((buffer_sortie = malloc((d_LONGUEUR + 1) * 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(NULL);
Line 131 reencodage(struct_processus *s_etat_proc	Line 132 reencodage(struct_processus *s_etat_proc
}	}
}	}

tampon = (unsigned char *) chaine_sortie;	tampon = chaine_sortie;
(*pointeur) = d_code_fin_chaine;	(*pointeur) = d_code_fin_chaine;

if ((chaine_sortie = malloc((strlen(tampon) + strlen(buffer_sortie) + 1)	if ((chaine_sortie = malloc((strlen(tampon) + strlen(buffer_sortie) + 1)
Line 175 localisation_courante(struct_processus *	Line 176 localisation_courante(struct_processus *
int pipes_sortie[2];	int pipes_sortie[2];
int status;	int status;

logical1 drapeau_fin;

long i;	long i;
long nombre_arguments;	long nombre_arguments;

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 216 localisation_courante(struct_processus *	Line 212 localisation_courante(struct_processus *
arguments[2] = NULL;	arguments[2] = NULL;

nombre_arguments = 2;	nombre_arguments = 2;
drapeau_fin = d_faux;

if (pipe(pipes_entree) != 0)	if (pipe(pipes_entree) != 0)
{	{
Line 236 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 408 localisation_courante(struct_processus *	Line 397 localisation_courante(struct_processus *
*/	*/

# 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
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 420 localisation_courante(struct_processus *	Line 409 localisation_courante(struct_processus *
if (waitpid(pid, &status, 0) == -1)	if (waitpid(pid, &status, 0) == -1)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
if (sem_wait((*s_etat_processus).semaphore_fork) == -1)	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
Line 437 localisation_courante(struct_processus *	Line 426 localisation_courante(struct_processus *
}	}

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
if (sem_wait((*s_etat_processus).semaphore_fork) == -1)	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
Line 461 localisation_courante(struct_processus *	Line 450 localisation_courante(struct_processus *
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
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 476 localisation_courante(struct_processus *	Line 467 localisation_courante(struct_processus *
longueur_lecture)) > 0)	longueur_lecture)) > 0)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
Line 502 localisation_courante(struct_processus *	Line 493 localisation_courante(struct_processus *
}	}

# 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
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 513 localisation_courante(struct_processus *	Line 504 localisation_courante(struct_processus *
}	}

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
Line 545 localisation_courante(struct_processus *	Line 536 localisation_courante(struct_processus *
return;	return;
}	}

(*s_etat_processus).localisation = tampon;	if (strlen(tampon) > 0)
	{
	(*s_etat_processus).localisation = tampon;
	}
	else
	{
	free(tampon);

	if (((*s_etat_processus).localisation = malloc((strlen(d_locale)
	+ 1) * sizeof(unsigned char))) == NULL)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

	strcpy((*s_etat_processus).localisation, d_locale);
	}

if (sigaction(SIGINT, &action_passee, NULL) != 0)	if (sigaction(SIGINT, &action_passee, NULL) != 0)
{	{
Line 567 localisation_courante(struct_processus *	Line 574 localisation_courante(struct_processus *
free(arguments);	free(arguments);

# 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
if (sem_post((*s_etat_processus).semaphore_fork) != 0)	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 580 localisation_courante(struct_processus *	Line 587 localisation_courante(struct_processus *
{	{
// Le processus fils renvoie une erreur.	// Le processus fils renvoie une erreur.

# ifndef SEMAPHORES_NOMMES	free(tampon);
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
# else	if (((*s_etat_processus).localisation = malloc((strlen(d_locale)
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)	+ 1) * sizeof(unsigned char))) == NULL)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme = d_es_processus;
{	return;
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}

(*s_etat_processus).erreur_execution = d_ex_erreur_processus;	strcpy((*s_etat_processus).localisation, d_locale);
return;
}	}

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
# endif	# endif
{	{
if (errno != EINTR)	if (errno != EINTR)
Line 634 transliterated_fprintf(struct_processus	Line 636 transliterated_fprintf(struct_processus

va_start(arguments, format);	va_start(arguments, format);

	# ifdef OS2
	unsigned char *ptr_e;;
	unsigned char *ptr_l;;
	unsigned char *tampon3;

	unsigned long i;
	# endif

if (valsprintf(&tampon, format, arguments) < 0)	if (valsprintf(&tampon, format, arguments) < 0)
{	{
va_end(arguments);	va_end(arguments);
Line 664 transliterated_fprintf(struct_processus	Line 674 transliterated_fprintf(struct_processus
tampon2 = tampon;	tampon2 = tampon;
}	}

	# ifdef OS2
	if ((flux == stderr) \|\| (flux == stdout))
	{
	i = 0;
	ptr_l = tampon2;

	while((*ptr_l) != d_code_fin_chaine)
	{
	if ((*ptr_l) == '\n')
	{
	i++;
	}

	ptr_l++;
	}

	if ((tampon3 = malloc((strlen(tampon2) + i + 1) *
	sizeof(unsigned char))) == NULL)
	{
	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
	return(-1);
	}

	ptr_e = tampon3;
	ptr_l = tampon2;

	while((*ptr_l) != d_code_fin_chaine)
	{
	(ptr_e) = (ptr_l);

	if ((*ptr_l) == '\n')
	{
	(*(++ptr_e)) = '\r';
	ptr_e++;
	ptr_l++;
	}
	else
	{
	ptr_e++;
	ptr_l++;
	}
	}

	(*ptr_e) = d_code_fin_chaine;

	free(tampon2);
	tampon2 = tampon3;
	}
	# endif

# ifdef SunOS	# ifdef SunOS
while((ios = fprintf(flux, "%s", tampon2)) < 0)	while((ios = fprintf(flux, "%s", tampon2)) < 0)
{	{
Line 735 tex_fprintf(struct_processus *s_etat_pro	Line 795 tex_fprintf(struct_processus *s_etat_pro
return(ios);	return(ios);
}	}

	#undef readline

	unsigned char *
	readline_wrapper(unsigned char *invite)
	{
	unsigned char *chaine;

	chaine = readline(invite);
	printf("\r");

	return(chaine);
	}


#define fprintf NULL	#define fprintf NULL
#define printf NULL	#define printf NULL

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.13
changed lines
	Added in v.1.50