--- rpl/src/transliteration.c 2010/09/02 07:51:48 1.21 +++ rpl/src/transliteration.c 2011/06/27 09:05:02 1.34 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.19 - Copyright (C) 1989-2010 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.0 + Copyright (C) 1989-2011 Dr. BERTRAND Joël This file is part of RPL/2. @@ -158,8 +158,8 @@ reencodage(struct_processus *s_etat_proc ================================================================================ Entrées : -------------------------------------------------------------------------------- + Sorties : -------------------------------------------------------------------------------- - iorties : Effets de bord : néant ================================================================================ */ @@ -686,50 +686,53 @@ transliterated_fprintf(struct_processus } # ifdef OS2 - i = 0; - ptr_l = tampon2; - - while((*ptr_l) != d_code_fin_chaine) - { - if ((*ptr_l) == '\n') - { - i++; - } - - ptr_l++; - } - - if ((tampon3 = malloc((strlen(tampon2) + i + 1) * sizeof(unsigned char))) - == NULL) + if ((flux == stdin) || (flux == stdout)) { - (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; - return(NULL); - } + i = 0; + ptr_l = tampon2; - ptr_e = tampon3; - ptr_l = tampon2; + while((*ptr_l) != d_code_fin_chaine) + { + if ((*ptr_l) == '\n') + { + i++; + } - while((*ptr_l) != d_code_fin_chaine) - { - (*ptr_e) = (*ptr_l); + ptr_l++; + } - if ((*ptr_l) == '\n') + if ((tampon3 = malloc((strlen(tampon2) + i + 1) * + sizeof(unsigned char))) == NULL) { - (*(++ptr_e)) = '\r'; - ptr_e++; - ptr_l++; + (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; + return(NULL); } - else + + ptr_e = tampon3; + ptr_l = tampon2; + + while((*ptr_l) != d_code_fin_chaine) { - ptr_e++; - ptr_l++; + (*ptr_e) = (*ptr_l); + + if ((*ptr_l) == '\n') + { + (*(++ptr_e)) = '\r'; + ptr_e++; + ptr_l++; + } + else + { + ptr_e++; + ptr_l++; + } } - } - (*ptr_e) = d_code_fin_chaine; + (*ptr_e) = d_code_fin_chaine; - free(tampon2); - tampon2 = tampon3; + free(tampon2); + tampon2 = tampon3; + } # endif # ifdef SunOS