--- rpl/src/instructions_r3.c 2010/03/09 10:18:48 1.8 +++ rpl/src/instructions_r3.c 2010/08/26 19:07:40 1.17 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.0.13 + 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" /* @@ -974,12 +974,24 @@ instruction_recall(struct_processus *s_e unsigned char *chaine; unsigned char *commande; unsigned char *executable_candidat; + +# ifndef OS2 unsigned char *instructions = "%s/bin/rpliconv %s " "`%s/bin/rplfile " "-m %s/share/rplfiles -i %s | awk " "'{ print $3; }' | awk -F= '{ if " "($2 != \"\") printf(\"-f %%s\", $2); }'` " "-t `locale charmap` | %s/bin/%s -o %s"; +# else + unsigned char *instructions = "sh -c \"%s/bin/rpliconv %s " + "`%s/bin/rplfile " + "-m %s/share/rplfiles -i %s | awk " + "'{ print $3; }' | awk -F= '{ if " + "($2 != \\\"\\\") printf(\\\"-f %%s\\\", " + "$2); }'` -t `" d_locale + "` | %s/bin/%s -o %s\""; +# endif + unsigned char *nom_fichier_temporaire; unsigned char *tampon_definitions_chainees; unsigned char *tampon_instruction_courante;