--- rpl/src/instructions_o1.c 2013/06/21 14:15:55 1.69 +++ rpl/src/instructions_o1.c 2015/02/19 11:01:25 1.81 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.15 - Copyright (C) 1989-2013 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.21 + Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -1028,7 +1028,8 @@ instruction_open(struct_processus *s_eta "\"file name\" } \"protection\" } OPEN\n"); printf(" { \"filetype\" \"access\" \"format\" { \"name\" " "\"file name\" } \n" - " { \"stty\" { \"stty parameters\" ... } } } OPEN\n"); + " { \"stty\" \"speed,bits,parity,stop\"\n" + " { \"stty parameters\" ... } } } OPEN\n"); printf(" { \"sockettype\" { \"name\" \"local name\" } } OPEN\n"); printf(" { \"sockettype\" \"socketdomain\" \"protection\" } OPEN\n"); printf(" \"/semaphore\" OPEN\n\n"); @@ -1078,7 +1079,7 @@ instruction_open(struct_processus *s_eta printf(" { \"STREAM\" \"READWRITE\" } OPEN\n"); printf(" { \"FOREIGN\" \"DATAGRAM\" } OPEN\n"); printf(" { \"LOCAL\" { \"NAME\" \"socket.sock\" } } OPEN\n"); - printf(" { { \"NAME\" \"/dev/ttyS1\" } { \"STTY\" { \"9600,8,N,1\" " + printf(" { { \"NAME\" \"/dev/ttyS1\" } { \"STTY\" \"9600,8,N,1\" " "\n { \"NO ICANON\" \"IGNBRK\" } } } OPEN\n"); return; @@ -1148,8 +1149,9 @@ instruction_open(struct_processus *s_eta { if ((*(*l_element_courant).donnee).type == CHN) { - if ((argument_majuscule = conversion_majuscule((unsigned char *) - (*(*l_element_courant).donnee).objet)) == NULL) + if ((argument_majuscule = conversion_majuscule(s_etat_processus, + (unsigned char *) (*(*l_element_courant).donnee).objet)) + == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -1763,7 +1765,7 @@ instruction_open(struct_processus *s_eta if ((*(*l_element_courant_sous_objet).donnee).type == CHN) { if ((argument_majuscule = conversion_majuscule( - (unsigned char *) + s_etat_processus, (unsigned char *) (*(*l_element_courant_sous_objet) .donnee).objet)) == NULL) { @@ -1829,7 +1831,7 @@ instruction_open(struct_processus *s_eta free(argument_majuscule); if ((argument_majuscule = conversion_majuscule( - (unsigned char *) + s_etat_processus, (unsigned char *) (*(*l_element_courant_sous_objet) .donnee).objet)) == NULL) { @@ -2143,7 +2145,6 @@ instruction_open(struct_processus *s_eta { type_arguments = 'S'; } - else if (type_arguments == 'F') { liberation(s_etat_processus, s_objet_argument); @@ -2320,7 +2321,7 @@ instruction_open(struct_processus *s_eta if ((*(*l_element_courant_sous_objet).donnee).type == CHN) { if ((argument_majuscule = conversion_majuscule( - (unsigned char *) + s_etat_processus, (unsigned char *) (*(*l_element_courant_sous_objet) .donnee).objet)) == NULL) { @@ -2361,7 +2362,7 @@ instruction_open(struct_processus *s_eta } if ((argument_majuscule = conversion_majuscule( - (unsigned char *) + s_etat_processus, (unsigned char *) (*(*l_element_courant_sous_objet) .donnee).objet)) == NULL) { @@ -3622,7 +3623,8 @@ instruction_open(struct_processus *s_eta } if ((parametre_courant_majuscule = conversion_majuscule( - (*(*parametre_courant).donnee).objet)) == NULL) + s_etat_processus, (*(*parametre_courant).donnee).objet)) + == NULL) { liberation(s_etat_processus, s_objet_argument); liberation(s_etat_processus, s_objet_resultat); @@ -3659,7 +3661,7 @@ instruction_open(struct_processus *s_eta // Vitesse unsigned char *vitesses[] = - { "0", "50", "75", "110", "134", "150", + { "50", "75", "110", "134", "150", "200", "300", "600", "1200", "1800", "2400", "4800", "9600", "19200", "38400", #ifdef B57600 @@ -3673,7 +3675,7 @@ instruction_open(struct_processus *s_eta #endif NULL }; tcflag_t vitesses_constantes[] = - { B0, B50, B75, B110, B134, B150, B200, B300, B600, + { B50, B75, B110, B134, B150, B200, B300, B600, B1200, B1800, B2400, B4800, B9600, B19200, B38400, #ifdef B57600 B57600, @@ -3936,7 +3938,8 @@ instruction_open(struct_processus *s_eta } if ((parametre_courant_majuscule = conversion_majuscule( - (*(*parametre_courant).donnee).objet)) == NULL) + s_etat_processus, (*(*parametre_courant).donnee) + .objet)) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire;