rpl/src/chainage.c - diff

Return to chainage.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/chainage.c between versions 1.8 and 1.18

version 1.8, 2010/03/27 13:42:35	version 1.18, 2010/08/26 19:07:34
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.13	RPL/2 (R) version 4.0.19
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2010 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 57 chainage(struct_processus *s_etat_proces	Line 57 chainage(struct_processus *s_etat_proces

unsigned char *commande;	unsigned char *commande;
unsigned char *executable_candidat;	unsigned char *executable_candidat;

	# ifndef OS2
unsigned char *instructions = "sed -e '1,1s/^#!/\\/\\//g' %s \| "	unsigned char *instructions = "sed -e '1,1s/^#!/\\/\\//g' %s \| "
"%s/bin/%s \| "	"%s/bin/%s \| "
"%s/bin/rpliconv `%s/bin/rplfile "	"%s/bin/rpliconv `%s/bin/rplfile "
"-m %s/share/rplfiles -i %s \| awk "	"-m %s/share/rplfiles -i %s \| awk "
"'{ print $3; }' \| awk -F= "	"'{ print $3; }' \| awk -F= "
"'{ if ($2 != \"\") printf(\"-f %%s\", "	"'{ if ($2 != \"\") printf(\"-f %%s\", "
"$2); }'` -t `locale charmap`//IGNORE > %s";	"$2); }'` -t %s//IGNORE > %s";
	# else
	unsigned char *instructions = "sh -c \""
	"sed -e '1,1s/^#!/\\/\\//g' %s \| "
	"%s/bin/%s \| "
	"%s/bin/rpliconv `%s/bin/rplfile "
	"-m %s/share/rplfiles -i %s \| awk "
	"'{ print $3; }' \| awk -F= "
	"'{ if ($2 != \\\"\\\") "
	"printf(\\\"-f %%s\\\", "
	"$2); }'` -t %s//IGNORE\" > %s";
	# endif

unsigned long unite_fichier;	unsigned long unite_fichier;

Line 107 chainage(struct_processus *s_etat_proces	Line 120 chainage(struct_processus *s_etat_proces
{	{
if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +	if ((commande = (unsigned char *) malloc((strlen(ds_preprocesseur) +
(2 * strlen((*s_etat_processus).nom_fichier_source)) +	(2 * strlen((*s_etat_processus).nom_fichier_source)) +
(4 * strlen(d_exec_path)) +	(4 * strlen(d_exec_path)) + strlen(d_locale) +
strlen(nom_fichier_temporaire) + strlen(instructions) - 11)	strlen(nom_fichier_temporaire) + strlen(instructions) - 13)
* 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;
Line 121 chainage(struct_processus *s_etat_proces	Line 134 chainage(struct_processus *s_etat_proces
(*s_etat_processus).nom_fichier_source,	(*s_etat_processus).nom_fichier_source,
d_exec_path, ds_preprocesseur, d_exec_path, d_exec_path,	d_exec_path, ds_preprocesseur, d_exec_path, d_exec_path,
d_exec_path, (*s_etat_processus).nom_fichier_source,	d_exec_path, (*s_etat_processus).nom_fichier_source,
nom_fichier_temporaire);	d_locale, nom_fichier_temporaire);

if (alsprintf(&executable_candidat, "%s/bin/rpliconv",	if (alsprintf(&executable_candidat, "%s/bin/rpliconv",
d_exec_path) < 0)	d_exec_path) < 0)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.8
changed lines
	Added in v.1.18