--- rpl/src/formateur.c	2011/09/26 15:57:10	1.40
+++ rpl/src/formateur.c	2011/11/17 22:21:16	1.41
@@ -47,6 +47,8 @@ formateur(struct_processus *s_etat_proce
 	logical4					autorisation_parenthese;
 	logical4					presence_signe;
 
+	long						longueur_chaine;
+
 	struct_liste_chainee		*l_atome;
 	struct_liste_chainee		*l_element_courant;
 	struct_liste_chainee		*l_liste1;
@@ -67,8 +69,6 @@ formateur(struct_processus *s_etat_proce
 	unsigned char				*format_majuscule;
 	unsigned char				*ptre;
 	unsigned char				*ptrl;
-	unsigned char				*ptr_ecriture;
-	unsigned char				*ptr_lecture;
 	unsigned char				*registre;
 	unsigned char				tampon[1024 + 1];
 
@@ -1752,205 +1752,25 @@ formateur(struct_processus *s_etat_proce
 --------------------------------------------------------------------------------
 */
 
-		if ((chaine = malloc((strlen((unsigned char *)
-				((*s_objet).objet)) + 1) * sizeof(unsigned char))) == NULL)
-		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return(NULL);
-		}
-
 		if (((*s_etat_processus).autorisation_conversion_chaine == 'Y') &&
 				(test_cfsf(s_etat_processus, 34) == d_vrai))
 		{
-			ptr_lecture = (unsigned char *) (*s_objet).objet;
-			ptr_ecriture = chaine;
-
-			while((*ptr_lecture) != d_code_fin_chaine)
+			if ((chaine = formateur_flux(s_etat_processus,
+					(unsigned char *) (*s_objet).objet, &longueur_chaine))
+					== NULL)
 			{
-				(*ptr_ecriture) = (*ptr_lecture);
-
-				// Début de la séquence d'échappement
-
-				if ((*ptr_lecture) == '\\')
-				{
-					if ((*(ptr_lecture + 1)) == '"')
-					{
-						ptr_lecture++;
-						(*ptr_ecriture) = '\"';
-					}
-					else if ((*(ptr_lecture + 1)) == 'b')
-					{
-						ptr_lecture++;
-						(*ptr_ecriture) = '\b';
-					}
-					else if ((*(ptr_lecture + 1)) == 'n')
-					{
-						ptr_lecture++;
-						(*ptr_ecriture) = '\n';
-					}
-					else if ((*(ptr_lecture + 1)) == 't')
-					{
-						ptr_lecture++;
-						(*ptr_ecriture) = '\t';
-					}
-					else if ((*(ptr_lecture + 1)) == 'x')
-					{
-						ptr_lecture += 2;
-
-						if ((*ptr_lecture) != d_code_fin_chaine)
-						{
-							if ((*(ptr_lecture + 1)) != d_code_fin_chaine)
-							{
-								logical1		erreur;
-								unsigned char	ec;
-
-								erreur = d_faux;
-
-								switch(*ptr_lecture)
-								{
-									case '0':
-									case '1':
-									case '2':
-									case '3':
-									case '4':
-									case '5':
-									case '6':
-									case '7':
-									case '8':
-									case '9':
-										ec = (*ptr_lecture) - '0';
-										break;
-
-									case 'A':
-									case 'B':
-									case 'C':
-									case 'D':
-									case 'E':
-									case 'F':
-										ec = ((*ptr_lecture) - 'A') + 10;
-										break;
-
-									default:
-										ec = 0;
-										erreur = d_vrai;
-										break;
-								}
-
-								ec *= 0x10;
-								ptr_lecture++;
-
-								switch(*ptr_lecture)
-								{
-									case '0':
-									case '1':
-									case '2':
-									case '3':
-									case '4':
-									case '5':
-									case '6':
-									case '7':
-									case '8':
-									case '9':
-										ec += (*ptr_lecture) - '0';
-										break;
-
-									case 'A':
-									case 'B':
-									case 'C':
-									case 'D':
-									case 'E':
-									case 'F':
-										ec += ((*ptr_lecture) - 'A') + 10;
-										break;
-
-									default:
-										erreur = d_vrai;
-										break;
-								}
-
-								(*ptr_ecriture) = ec;
-
-								if (erreur == d_vrai)
-								{
-									if ((*s_etat_processus).langue == 'F')
-									{
-										printf("+++Information : "
-												"Séquence d'échappement "
-												"inconnue [%d]\n",
-												(int) getpid());
-									}
-									else
-									{
-										printf("+++Warning : Unknown "
-												"escape code "
-												"[%d]\n", (int) getpid());
-									}
-								}
-							}
-							else
-							{
-								if ((*s_etat_processus).langue == 'F')
-								{
-									printf("+++Information : "
-											"Séquence d'échappement "
-											"inconnue [%d]\n", (int) getpid());
-								}
-								else
-								{
-									printf("+++Warning : Unknown escape code "
-											"[%d]\n", (int) getpid());
-								}
-							}
-						}
-						else
-						{
-							if ((*s_etat_processus).langue == 'F')
-							{
-								printf("+++Information : "
-										"Séquence d'échappement "
-										"inconnue [%d]\n", (int) getpid());
-							}
-							else
-							{
-								printf("+++Warning : Unknown escape code "
-										"[%d]\n", (int) getpid());
-							}
-						}
-					}
-					else if ((*(ptr_lecture + 1)) == '\\')
-					{
-						ptr_lecture++;
-					}
-					else
-					{
-						if ((*s_etat_processus).langue == 'F')
-						{
-							printf("+++Information : Séquence d'échappement "
-									"inconnue [%d]\n", (int) getpid());
-						}
-						else
-						{
-							printf("+++Warning : Unknown escape code "
-									"[%d]\n", (int) getpid());
-						}
-					}
-				}
-
-				ptr_ecriture++;
-			   	ptr_lecture++;
-			}
-
-			(*ptr_ecriture) = d_code_fin_chaine;
-
-			if ((chaine = realloc(chaine, ((ptr_ecriture - chaine) + 1) *
-					sizeof(unsigned char))) == NULL)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 				return(NULL);
 			}
 		}
 		else
 		{
+			if ((chaine = malloc((strlen((unsigned char *)
+					((*s_objet).objet)) + 1) * sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return(NULL);
+			}
+
 			strcpy(chaine, (unsigned char *) ((*s_objet).objet));
 		}
 	}