--- rpl/src/chainage.c	2010/04/17 18:57:35	1.10
+++ rpl/src/chainage.c	2010/09/07 08:58:04	1.19
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.14
+  RPL/2 (R) version 4.0.19
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -20,7 +20,7 @@
 */
 
 
-#include "rpl.conv.h"
+#include "rpl-conv.h"
 
 
 /*
@@ -49,6 +49,7 @@ chainage(struct_processus *s_etat_proces
 
 	logical1				drapeau_fin;
 	logical1				existence;
+	logical1				initialisation;
 	logical1				ouverture;
 	logical1				presence_chaine;
 
@@ -57,13 +58,24 @@ chainage(struct_processus *s_etat_proces
 
 	unsigned char			*commande;
 	unsigned char			*executable_candidat;
-	unsigned char			*instructions = "sed -e '1,1s/^#!/\\/\\//g' %s | "
-									"%s/bin/%s | "
+
+#	ifndef OS2
+	unsigned char			*instructions = "%s/bin/%s %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";
+#	else
+	unsigned char			*instructions = "sh -c \""
+									"%s/bin/%s %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;
 
@@ -118,8 +130,9 @@ chainage(struct_processus *s_etat_proces
 			}
 
 			sprintf(commande, instructions,
+					d_exec_path, ds_preprocesseur,
 					(*s_etat_processus).nom_fichier_source,
-					d_exec_path, ds_preprocesseur, d_exec_path, d_exec_path,
+					d_exec_path, d_exec_path,
 					d_exec_path, (*s_etat_processus).nom_fichier_source,
 					d_locale, nom_fichier_temporaire);
 
@@ -345,11 +358,43 @@ chainage(struct_processus *s_etat_proces
 
 			i = 0;
 			drapeau_fin = d_faux;
+			initialisation = d_vrai;
+
+			/*
+			 * Élimination du sharp-bang si nécessaire et des caractères
+			 * inutiles. Conversion de caractères.
+			 */
 
 			while(drapeau_fin == d_faux)
 			{
 				if ((caractere = getc(f_source)) != EOF)
 				{
+					if (initialisation == d_vrai)
+					{
+						if (caractere == '#')
+						{
+							if ((caractere = getc(f_source)) != EOF)
+							{
+								if (caractere == '!')
+								{
+									do
+									{
+										caractere = getc(f_source);
+									} while((caractere != EOF) &&
+											(caractere !=
+											d_code_retour_chariot));
+								}
+								else
+								{
+									rewind(f_source);
+									caractere = getc(f_source);
+								}
+							}
+						}
+
+						initialisation = d_faux;
+					}
+
 					if ((caractere == d_code_retour_chariot) ||
 							(caractere == d_code_tabulation) ||
 							((caractere == d_code_espace) &&