[BACK]Return to io_socket.c CVS log [TXT] [DIR] Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/io_socket.c between versions 1.3 and 1.7

version 1.3, 2025/03/09 19:14:25 version 1.7, 2025/03/24 02:56:15
Line 24 Line 24
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.   *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *   *
  *   $Log$   *   $Log$
    *   Revision 1.7  2025/03/24 02:56:15  snw
    *   Socket I/O compat fixes for OS/2
    *
    *   Revision 1.6  2025/03/24 02:55:26  snw
    *   Socket I/O compat fixes for OS/2
    *
    *   Revision 1.5  2025/03/24 02:54:11  snw
    *   Socket I/O compat fixes for OS/2
    *
    *   Revision 1.4  2025/03/22 18:43:54  snw
    *   Make STRLEN 255 chars and add BIGSTR macro for larger buffers
    *
  *   Revision 1.3  2025/03/09 19:14:25  snw   *   Revision 1.3  2025/03/09 19:14:25  snw
  *   First phase of REUSE compliance and header reformat   *   First phase of REUSE compliance and header reformat
  *   *
Line 79  io_socket *io_sockets[MAXSCK]; Line 91  io_socket *io_sockets[MAXSCK];
    addr_string: server:port[:family:[udp|tcp]]*/     addr_string: server:port[:family:[udp|tcp]]*/
 short msck_open (int channel, char *addr_string)  short msck_open (int channel, char *addr_string)
 {  {
 #if !defined(MSDOS)  #if !defined(MSDOS) && !defined(__OS2__)
     char *addr = "";      char *addr = "";
     char *port = "";      char *port = "";
     char *family = "";      char *family = "";
Line 99  short msck_open (int channel, char *addr Line 111  short msck_open (int channel, char *addr
   
     short i = channel + FIRSTSCK;   /* get index into io_sockets[] array */      short i = channel + FIRSTSCK;   /* get index into io_sockets[] array */
   
     finaddr = (char *) malloc (STRLEN * sizeof (char));      finaddr = (char *) malloc (256 * sizeof (char));
     NULLPTRCHK(finaddr,"msck_open");      NULLPTRCHK(finaddr,"msck_open");
   
           
Line 120  short msck_open (int channel, char *addr Line 132  short msck_open (int channel, char *addr
           
     if (ct == 1) {      if (ct == 1) {
   
         family = (char *) malloc (STRLEN * sizeof (char));          family = (char *) malloc (256 * sizeof (char));
         NULLPTRCHK(family,"msck_open");          NULLPTRCHK(family,"msck_open");
                   
         typ = (char *) malloc (STRLEN * sizeof (char));          typ = (char *) malloc (256 * sizeof (char));
         NULLPTRCHK(typ,"msck_open");          NULLPTRCHK(typ,"msck_open");
                   
         strcpy (family, "IPV4");          strcpy (family, "IPV4");
Line 133  short msck_open (int channel, char *addr Line 145  short msck_open (int channel, char *addr
     if (ct == 2) {      if (ct == 2) {
         family = strtok (NULL, ":");          family = strtok (NULL, ":");
   
         typ = (char *) malloc (STRLEN * sizeof (char));          typ = (char *) malloc (256 * sizeof (char));
         NULLPTRCHK(typ,"msck_open");          NULLPTRCHK(typ,"msck_open");
                   
         strcpy (typ, "TCP");          strcpy (typ, "TCP");
Line 238  short msck_open (int channel, char *addr Line 250  short msck_open (int channel, char *addr
 short msck_connect (int channel)  short msck_connect (int channel)
 {  {
   
 #if !defined(MSDOS)  #if !defined(MSDOS) && !defined(__OS2__)
           
     short i = channel + FIRSTSCK;      short i = channel + FIRSTSCK;
   
Line 276  short msck_connect (int channel) Line 288  short msck_connect (int channel)
 short msck_write (int channel, char *buf, short length)  short msck_write (int channel, char *buf, short length)
 {  {
   
 #if !defined(MSDOS)      #if !defined(MSDOS) && !defined(__OS2__)    
           
     ssize_t ct;      ssize_t ct;
     short i = channel + FIRSTSCK;      short i = channel + FIRSTSCK;
Line 311  short msck_write (int channel, char *buf Line 323  short msck_write (int channel, char *buf
 short msck_read (int channel, char *buf, long sck_timeout, short sck_timeoutms, short length)  short msck_read (int channel, char *buf, long sck_timeout, short sck_timeoutms, short length)
 {  {
   
 #if !defined(MSDOS)      #if !defined(MSDOS) && !defined(__OS2__)    
     fd_set fds;      fd_set fds;
     short i;      short i;
     struct timeval t;      struct timeval t;
Line 415  read_done: Line 427  read_done:
 short msck_close (int channel)  short msck_close (int channel)
 {  {
   
 #if !defined(MSDOS)      #if !defined(MSDOS) && !defined(__OS2__)    
     short i = channel + FIRSTSCK;      short i = channel + FIRSTSCK;
   
   
Removed from v.1.3  
changed lines
  Added in v.1.7

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>