Compilation fix.

[wxWidgets.git] / src / os2 / gsocket.c

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 242e3f4038831c9ffb91eaa085ec60dbfc8f5d99..4547bd415122d311cdb246c2cdf662e2a85ea366 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -4,6 +4,7 @@
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket main Unix-style file
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket main Unix-style file

+ * Licence: The wxWindows licence

  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */


@@ -131,6 +132,7 @@ int _System soclose(int);
   signal(SIGPIPE, old_handler);             \
 }
 
   signal(SIGPIPE, old_handler);             \
 }
 

+

 #ifndef __GSOCKET_STANDALONE__
 #  include "wx/unix/gsockunx.h"
 #  include "wx/gsocket.h"
 #ifndef __GSOCKET_STANDALONE__
 #  include "wx/unix/gsockunx.h"
 #  include "wx/gsocket.h"


@@ -150,7 +152,6 @@ int _System soclose(int);
 #endif /* wxUSE_GUI */
 
 /* debugging helpers */
 #endif /* wxUSE_GUI */
 
 /* debugging helpers */

-#define  __GSOCKET_DEBUG__

 #ifdef __GSOCKET_DEBUG__
 #  define GSocket_Debug(args) printf args
 #else
 #ifdef __GSOCKET_DEBUG__
 #  define GSocket_Debug(args) printf args
 #else


@@ -208,6 +209,13 @@ GSocket *GSocket_new(void)
   return socket;
 }
 
   return socket;
 }
 

+void GSocket_close(GSocket *socket)
+{
+    _GSocket_Disable_Events(socket);
+    soclose(socket->m_fd);
+    socket->m_fd = INVALID_SOCKET;
+}
+

 void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
 void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);


@@ -244,8 +252,7 @@ void GSocket_Shutdown(GSocket *socket)
   if (socket->m_fd != INVALID_SOCKET)
   {
     shutdown(socket->m_fd, 2);
   if (socket->m_fd != INVALID_SOCKET)
   {
     shutdown(socket->m_fd, 2);

-    soclose(socket->m_fd);
-    socket->m_fd = INVALID_SOCKET;
+    GSocket_close(socket);

   }
 
   /* Disable GUI callbacks */
   }
 
   /* Disable GUI callbacks */


@@ -379,11 +386,11 @@ GAddress *GSocket_GetPeer(GSocket *socket)
  *  Sets up this socket as a server. The local address must have been
  *  set with GSocket_SetLocal() before GSocket_SetServer() is called.
  *  Returns GSOCK_NOERROR on success, one of the following otherwise:
  *  Sets up this socket as a server. The local address must have been
  *  set with GSocket_SetLocal() before GSocket_SetServer() is called.
  *  Returns GSOCK_NOERROR on success, one of the following otherwise:

- *
+ * 

  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.

- *    GSOCK_IOERR   - low-level error.
+ *    GSOCK_IOERR   - low-level error. 

  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {


@@ -432,8 +439,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
       (listen(sck->m_fd, 5) != 0))
   {
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
       (listen(sck->m_fd, 5) != 0))
   {

-    soclose(sck->m_fd);
-    sck->m_fd = INVALID_SOCKET;
+    GSocket_close(sck);

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }


@@ -451,7 +457,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
  *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
  *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
  *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
  *    GSOCK_MEMERR     - couldn't allocate memory.

- *    GSOCK_IOERR      - low-level error.
+ *    GSOCK_IOERR      - low-level error. 

  */
 GSocket *GSocket_WaitConnection(GSocket *socket)
 {
  */
 GSocket *GSocket_WaitConnection(GSocket *socket)
 {


@@ -554,7 +560,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
  *    GSOCK_TIMEDOUT   - timeout, the connection failed.
  *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_TIMEDOUT   - timeout, the connection failed.
  *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
  *    GSOCK_MEMERR     - couldn't allocate memory.

- *    GSOCK_IOERR      - low-level error.
+ *    GSOCK_IOERR      - low-level error. 

  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {
  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {


@@ -600,8 +606,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   /* Connect it to the peer address, with a timeout (see below) */
   ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
 
   /* Connect it to the peer address, with a timeout (see below) */
   ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
 

-  printf("connect on %d to %X (%d) returned %d, errno = %d\n",
-     sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno);

   if (ret == -1)
   {
     err = errno;
   if (ret == -1)
   {
     err = errno;


@@ -615,8 +619,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     {
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
     {
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {

-        soclose(sck->m_fd);
-        sck->m_fd = INVALID_SOCKET;
+        GSocket_close(sck);

         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }
         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }


@@ -648,8 +651,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     /* If connect failed with an error other than EINPROGRESS,
      * then the call to GSocket_Connect has failed.
      */
     /* If connect failed with an error other than EINPROGRESS,
      * then the call to GSocket_Connect has failed.
      */

-    soclose(sck->m_fd);
-    sck->m_fd = INVALID_SOCKET;
+    GSocket_close(sck);

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }


@@ -713,8 +715,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
                    sck->m_local->m_addr,
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0))
   {
                    sck->m_local->m_addr,
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0))
   {

-    soclose(sck->m_fd);
-    sck->m_fd    = INVALID_SOCKET;
+    GSocket_close(sck);

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }


@@ -749,7 +750,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
     ret = _GSocket_Recv_Stream(socket, buffer, size);
   else
     ret = _GSocket_Recv_Dgram(socket, buffer, size);
     ret = _GSocket_Recv_Stream(socket, buffer, size);
   else
     ret = _GSocket_Recv_Dgram(socket, buffer, size);

-
+    

   if (ret == -1)
   {
     if (errno == EWOULDBLOCK)
   if (ret == -1)
   {
     if (errno == EWOULDBLOCK)


@@ -757,16 +758,16 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
     else
       socket->m_error = GSOCK_IOERR;
   }
     else
       socket->m_error = GSOCK_IOERR;
   }

-
+  

   return ret;
 }
 
 int GSocket_Write(GSocket *socket, const char *buffer, int size)
   return ret;
 }
 
 int GSocket_Write(GSocket *socket, const char *buffer, int size)

-{
+{                        

   int ret;
 
   assert(socket != NULL);
   int ret;
 
   assert(socket != NULL);

-
+  

   GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
 
   if (socket->m_fd == INVALID_SOCKET || socket->m_server)
   GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
 
   if (socket->m_fd == INVALID_SOCKET || socket->m_server)


@@ -788,7 +789,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
     ret = _GSocket_Send_Stream(socket, buffer, size);
   else
     ret = _GSocket_Send_Dgram(socket, buffer, size);
     ret = _GSocket_Send_Stream(socket, buffer, size);
   else
     ret = _GSocket_Send_Dgram(socket, buffer, size);

-
+    

   GSocket_Debug(( "GSocket_Write #4, size %d\n", size ));
 
   if (ret == -1)
   GSocket_Debug(( "GSocket_Write #4, size %d\n", size ));
 
   if (ret == -1)


@@ -812,7 +813,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
     _GSocket_Enable(socket, GSOCK_OUTPUT);
     return -1;
   }
     _GSocket_Enable(socket, GSOCK_OUTPUT);
     return -1;
   }

-
+  

   GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
 
   return ret;
   GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
 
   return ret;


@@ -848,13 +849,25 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
   FD_SET(socket->m_fd, &writefds);
   FD_SET(socket->m_fd, &exceptfds);
 
   FD_SET(socket->m_fd, &writefds);
   FD_SET(socket->m_fd, &exceptfds);
 

-  /* Check known state first */
-  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
-  result |= (GSOCK_LOST_FLAG       & socket->m_detected & flags);
+  /* Check 'sticky' CONNECTION flag first */
+  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);
+
+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    return (GSOCK_LOST_FLAG & flags);
+  }

 
   /* Try select now */
   if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
 
   /* Try select now */
   if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)

-    return result;
+  {
+    /* What to do here? */
+    return (result & flags);
+  }

 
   /* Check for readability */
   if (FD_ISSET(socket->m_fd, &readfds))
 
   /* Check for readability */
   if (FD_ISSET(socket->m_fd, &readfds))


@@ -863,19 +876,22 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 
     if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
     {
 
     if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
     {

-      result |= (GSOCK_INPUT_FLAG & flags);
+      result |= GSOCK_INPUT_FLAG;

     }
     else
     {
       if (socket->m_server && socket->m_stream)
       {
     }
     else
     {
       if (socket->m_server && socket->m_stream)
       {

-        result |= (GSOCK_CONNECTION_FLAG & flags);
+        result |= GSOCK_CONNECTION_FLAG;

         socket->m_detected |= GSOCK_CONNECTION_FLAG;
       }
       else
       {
         socket->m_detected |= GSOCK_CONNECTION_FLAG;
       }
       else
       {

-        result |= (GSOCK_LOST_FLAG & flags);

         socket->m_detected = GSOCK_LOST_FLAG;
         socket->m_detected = GSOCK_LOST_FLAG;

+        socket->m_establishing = FALSE;
+    
+        /* LOST event: Abort any further processing */
+        return (GSOCK_LOST_FLAG & flags);

       }
     }
   }
       }
     }
   }


@@ -894,32 +910,36 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 
       if (error)
       {
 
       if (error)
       {

-        result |= (GSOCK_LOST_FLAG & flags);

         socket->m_detected = GSOCK_LOST_FLAG;
         socket->m_detected = GSOCK_LOST_FLAG;

+
+        /* LOST event: Abort any further processing */
+        return (GSOCK_LOST_FLAG & flags);

       }
       else
       {
       }
       else
       {

-        result |= (GSOCK_CONNECTION_FLAG & flags);
+        result |= GSOCK_CONNECTION_FLAG;

         socket->m_detected |= GSOCK_CONNECTION_FLAG;
       }
     }
     else
     {
         socket->m_detected |= GSOCK_CONNECTION_FLAG;
       }
     }
     else
     {

-      result |= (GSOCK_OUTPUT_FLAG & flags);
+      result |= GSOCK_OUTPUT_FLAG;

     }
   }
 
   /* Check for exceptions and errors (is this useful in Unices?) */
   if (FD_ISSET(socket->m_fd, &exceptfds))
   {
     }
   }
 
   /* Check for exceptions and errors (is this useful in Unices?) */
   if (FD_ISSET(socket->m_fd, &exceptfds))
   {

-    result |= (GSOCK_LOST_FLAG & flags);

     socket->m_establishing = FALSE;
     socket->m_detected = GSOCK_LOST_FLAG;
     socket->m_establishing = FALSE;
     socket->m_detected = GSOCK_LOST_FLAG;

+
+    /* LOST event: Abort any further processing */
+    return (GSOCK_LOST_FLAG & flags);

   }
 
   }
 

-  return result;
+  return (result & flags);

 
 

-#else
+#else 

 
   assert(socket != NULL);
   return flags & socket->m_detected;
 
   assert(socket != NULL);
   return flags & socket->m_detected;


@@ -972,7 +992,7 @@ GSocketError GSocket_GetError(GSocket *socket)
  *   operation, there is still data available, the callback function will
  *   be called again.
  * GSOCK_OUTPUT:
  *   operation, there is still data available, the callback function will
  *   be called again.
  * GSOCK_OUTPUT:

- *   The socket is available for writing. That is, the next write call
+ *   The socket is available for writing. That is, the next write call 

  *   won't block. This event is generated only once, when the connection is
  *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
  *   when the output buffer empties again. This means that the app should
  *   won't block. This event is generated only once, when the connection is
  *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
  *   when the output buffer empties again. This means that the app should


@@ -1006,8 +1026,6 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
   {
     if ((flags & (1 << count)) != 0)
     {
   {
     if ((flags & (1 << count)) != 0)
     {

-      printf("Setting callback no %d for socket at %X to address %X,data %X\n",
-         count, socket, callback, cdata);

       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }
       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }


@@ -1028,8 +1046,6 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
   {
     if ((flags & (1 << count)) != 0)
     {
   {
     if ((flags & (1 << count)) != 0)
     {

-      printf("Removing callback no %d for socket at %X",
-         count, socket);

       socket->m_cbacks[count] = NULL;
       socket->m_data[count] = NULL;
     }
       socket->m_cbacks[count] = NULL;
       socket->m_data[count] = NULL;
     }


@@ -1039,11 +1055,8 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
 
 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \
 
 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \

-  if (socket->m_cbacks[event]){                                         \
-    printf("Call callback for event %d, socket %X: %X, %X\n", event,    \
-            socket, socket->m_cbacks[event], socket->m_data[event]);    \
+  if (socket->m_cbacks[event])                                          \

     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \
     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \

-  }                                                                     \

 }
 
 
 }
 
 


@@ -1240,6 +1253,18 @@ void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;
 
 {
   char c;
 

+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }
+

   if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
   {
     CALL_CALLBACK(socket, GSOCK_INPUT);
   if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
   {
     CALL_CALLBACK(socket, GSOCK_INPUT);


@@ -1253,12 +1278,25 @@ void _GSocket_Detected_Read(GSocket *socket)
     else
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
     else
     {
       CALL_CALLBACK(socket, GSOCK_LOST);

+      GSocket_Shutdown(socket);

     }
   }
 }
 
 void _GSocket_Detected_Write(GSocket *socket)
 {
     }
   }
 }
 
 void _GSocket_Detected_Write(GSocket *socket)
 {

+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }
+

   if (socket->m_establishing && !socket->m_server)
   {
     int error;
   if (socket->m_establishing && !socket->m_server)
   {
     int error;


@@ -1271,6 +1309,7 @@ void _GSocket_Detected_Write(GSocket *socket)
     if (error)
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
     if (error)
     {
       CALL_CALLBACK(socket, GSOCK_LOST);

+      GSocket_Shutdown(socket);

     }
     else
     {
     }
     else
     {


@@ -1351,7 +1390,7 @@ GAddress *GAddress_copy(GAddress *address)
 
   memcpy(addr2, address, sizeof(GAddress));
 
 
   memcpy(addr2, address, sizeof(GAddress));
 

-  if (address->m_addr)
+  if (address->m_addr && address->m_len > 0)

   {
     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);
     if (addr2->m_addr == NULL)
   {
     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);
     if (addr2->m_addr == NULL)


@@ -1549,10 +1588,12 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }

-
+ 

   se = getservbyname(port, protocol);
   if (!se)
   {
   se = getservbyname(port, protocol);
   if (!se)
   {

+    /* the cast to int suppresses compiler warnings about subscript having the
+       type char */

     if (isdigit((int)port[0]))
     {
       int port_int;
     if (isdigit((int)port[0]))
     {
       int port_int;


@@ -1579,7 +1620,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET);
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET);

-
+ 

   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);
 


@@ -1592,7 +1633,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   char *addr_buf;
   struct sockaddr_in *addr;
 
   char *addr_buf;
   struct sockaddr_in *addr;
 

-  assert(address != NULL);
+  assert(address != NULL); 

   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;
   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;


@@ -1614,8 +1655,8 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);
-  CHECK_ADDRESS_RETVAL(address, INET, 0);
+  assert(address != NULL); 
+  CHECK_ADDRESS_RETVAL(address, INET, 0); 

 
   addr = (struct sockaddr_in *)address->m_addr;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 


@@ -1626,8 +1667,8 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);
-  CHECK_ADDRESS_RETVAL(address, INET, 0);
+  assert(address != NULL); 
+  CHECK_ADDRESS_RETVAL(address, INET, 0); 

 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);
 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);


@@ -1658,16 +1699,19 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

+#define UNIX_SOCK_PATHLEN (sizeof(addr->sun_path)/sizeof(addr->sun_path[0]))
+

 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
   struct sockaddr_un *addr;
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
   struct sockaddr_un *addr;
 

-  assert(address != NULL);
+  assert(address != NULL); 

 
 

-  CHECK_ADDRESS(address, UNIX);
+  CHECK_ADDRESS(address, UNIX); 

 
   addr = ((struct sockaddr_un *)address->m_addr);
 
   addr = ((struct sockaddr_un *)address->m_addr);

-  memcpy(addr->sun_path, path, strlen(path));
+  strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);
+  addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0';

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }