--- rpl/src/interface_gnuplot.c	2010/02/28 14:47:14	1.4
+++ rpl/src/interface_gnuplot.c	2010/05/24 10:58:36	1.10
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.11
+  RPL/2 (R) version 4.0.16
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -266,16 +266,35 @@ appel_gnuplot(struct_processus *s_etat_p
 		if ((*s_etat_processus).entree_standard == NULL)
 		{
 #ifdef FORCE_GNUPLOT_PATH
-			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
-					== NULL)
+			if ((*s_etat_processus).rpl_home == NULL)
 			{
-				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-				return;
+				if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+						strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+						== NULL)
+				{
+					(*s_etat_processus).erreur_systeme =
+							d_es_allocation_memoire;
+					return;
+				}
+
+				sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+						ds_gnuplot_commande);
 			}
+			else
+			{
+				if ((commande_gnuplot = malloc((strlen(
+						(*s_etat_processus).rpl_home) + 6 +
+						strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+						== NULL)
+				{
+					(*s_etat_processus).erreur_systeme =
+							d_es_allocation_memoire;
+					return;
+				}
 
-			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-					ds_gnuplot_commande);
+				sprintf(commande_gnuplot, "%s/bin/%s",
+						(*s_etat_processus).rpl_home, ds_gnuplot_commande);
+			}
 #else
 			if ((commande_gnuplot = malloc((1 +
 					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
@@ -320,16 +339,33 @@ appel_gnuplot(struct_processus *s_etat_p
 		entree_standard = (*s_etat_processus).entree_standard;
 
 #if FORCE_GNUPLOT_PATH
-		if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-				strlen(ds_gnuplot_commande_persistante)) *
-				sizeof(unsigned char))) == NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+					strlen(ds_gnuplot_commande_persistante)) *
+					sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+					ds_gnuplot_commande_persistante);
 		}
+		else
+		{
+			if ((commande_gnuplot = malloc((strlen(
+					(*s_etat_processus).rpl_home) + 6 +
+					strlen(ds_gnuplot_commande_persistante)) *
+					sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
 
-		sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-				ds_gnuplot_commande_persistante);
+			sprintf(commande_gnuplot, "%s/bin/%s", (*s_etat_processus).rpl_home,
+					ds_gnuplot_commande_persistante);
+		}
 #else
 		if ((commande_gnuplot = malloc((1 +
 				strlen(ds_gnuplot_commande_persistante)) *
@@ -373,16 +409,32 @@ appel_gnuplot(struct_processus *s_etat_p
 		entree_standard = (*s_etat_processus).entree_standard;
 
 #ifdef FORCE_GNUPLOT_PATH
-		if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
-				== NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+					ds_gnuplot_commande);
 		}
+		else
+		{
+			if ((commande_gnuplot = malloc((strlen((*s_etat_processus).rpl_home)
+					+ 6 + strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
 
-		sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-				ds_gnuplot_commande);
+			sprintf(commande_gnuplot, "%s/bin/%s", (*s_etat_processus).rpl_home,
+					ds_gnuplot_commande);
+		}
 #else
 		if ((commande_gnuplot = malloc((1 +
 				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
@@ -437,16 +489,32 @@ appel_gnuplot(struct_processus *s_etat_p
 		entree_standard = (*s_etat_processus).entree_standard;
 
 #ifdef FORCE_GNUPLOT_PATH
-		if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
-				== NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+					ds_gnuplot_commande);
 		}
+		else
+		{
+			if ((commande_gnuplot = malloc((strlen((*s_etat_processus).rpl_home)
+					+ 6 + strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
 
-		sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-				ds_gnuplot_commande);
+			sprintf(commande_gnuplot, "%s/bin/%s", (*s_etat_processus).rpl_home,
+					ds_gnuplot_commande);
+		}
 #else
 		if ((commande_gnuplot = malloc((1 +
 				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))