Added wxStrnicmp and to wchar.h, not yet for Unicode mode.

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 1d0c60ec76bf672fd396bb2e3e8c1f7a7a385380..004f6c38dd935ffa5cc2fe521789502f0e479d25 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -11,8 +11,9 @@
 #if wxUSE_SOCKETS
 
 #include <assert.h>
 #if wxUSE_SOCKETS
 
 #include <assert.h>

-#include <sys/ioctl.h>

 #include <sys/types.h>
 #include <sys/types.h>

+#include <netdb.h>
+#include <sys/ioctl.h>

 #ifdef vms
 #include <socket.h>
 #else
 #ifdef vms
 #include <socket.h>
 #else


@@ -22,7 +23,6 @@
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

-#include <netdb.h>

 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>


@@ -485,12 +485,10 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
         close(sck->m_fd);
         sck->m_fd = -1;
         /* sck->m_error is set in _GSocket_Output_Timeout */
         close(sck->m_fd);
         sck->m_fd = -1;
         /* sck->m_error is set in _GSocket_Output_Timeout */

-        fprintf(stderr, "Blocking connect timeouts\n");

         return GSOCK_TIMEDOUT;
       }
       else
       {
         return GSOCK_TIMEDOUT;
       }
       else
       {

-        fprintf(stderr, "Blocking connect OK\n");

         return GSOCK_NOERROR;
       }
     }
         return GSOCK_NOERROR;
       }
     }


@@ -505,7 +503,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     {
       sck->m_error = GSOCK_WOULDBLOCK;
       sck->m_establishing = TRUE;
     {
       sck->m_error = GSOCK_WOULDBLOCK;
       sck->m_establishing = TRUE;

-      fprintf(stderr, "Nonblocking connect in progress\n");

 
       return GSOCK_WOULDBLOCK;
     }
 
       return GSOCK_WOULDBLOCK;
     }


@@ -517,11 +514,9 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     sck->m_fd = -1;
     sck->m_error = GSOCK_IOERR;
 
     sck->m_fd = -1;
     sck->m_error = GSOCK_IOERR;
 

-    fprintf(stderr, "Connect failed (generic err)\n");

     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  fprintf(stderr, "Connect OK\n");

   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 


@@ -906,7 +901,7 @@ void _GSocket_Detected_Write(GSocket *socket)
     socket->m_establishing = FALSE;
 
     len = sizeof(error);
     socket->m_establishing = FALSE;
 
     len = sizeof(error);

-    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, &error, &len);
+    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);

 
     if (error)
     {
 
     if (error)
     {


@@ -1074,18 +1069,18 @@ GSocketError _GAddress_translate_to(GAddress *address,
 
 GSocketError _GAddress_Init_INET(GAddress *address)
 {
 
 GSocketError _GAddress_Init_INET(GAddress *address)
 {

-  address->m_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_in));
-  if (address->m_addr == NULL) {
+  address->m_len  = sizeof(struct sockaddr_in);
+  address->m_addr = (struct sockaddr *)malloc(address->m_len);
+  if (address->m_addr == NULL)
+  {

     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 

-  address->m_len  = sizeof(struct sockaddr_in);
-

   address->m_family = GSOCK_INET;
   address->m_realfamily = PF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
   address->m_family = GSOCK_INET;
   address->m_realfamily = PF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;

-  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr   = INADDR_ANY;
+  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1103,18 +1098,22 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 
   /* If it is a numeric host name, convert it now */
 #if defined(HAVE_INET_ATON)
 
   /* If it is a numeric host name, convert it now */
 #if defined(HAVE_INET_ATON)

-  if (inet_aton(hostname, addr) == 0) {
+  if (inet_aton(hostname, addr) == 0)
+  {

 #elif defined(HAVE_INET_ADDR)
   /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */
 #elif defined(HAVE_INET_ADDR)
   /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */

-  if ( (addr->s_addr = inet_addr(hostname)) == -1 ) {
+  if ( (addr->s_addr = inet_addr(hostname)) == -1 )
+  {

 #else
   /* Use gethostbyname by default */
 #else
   /* Use gethostbyname by default */

-  if (1) {
+  if (1)
+  {

 #endif
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */
 #endif
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */

-    if ((he = gethostbyname(hostname)) == NULL) {
+    if ((he = gethostbyname(hostname)) == NULL)
+    {

       address->m_error = GSOCK_NOHOST;
       return GSOCK_NOHOST;
     }
       address->m_error = GSOCK_NOHOST;
       return GSOCK_NOHOST;
     }


@@ -1148,14 +1147,16 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   assert(address != NULL);
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
 

-  if (!port) {
+  if (!port)
+  {

     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
  
   se = getservbyname(port, protocol);
   if (!se) {
     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
  
   se = getservbyname(port, protocol);
   if (!se) {

-    if (isdigit(port[0])) {
+    if (isdigit(port[0]))
+    {

       int port_int;
 
       port_int = atoi(port);
       int port_int;
 
       port_int = atoi(port);


@@ -1199,8 +1200,9 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
 

-  he       = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
-  if (he == NULL) {
+  he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
+  if (he == NULL)
+  {

     address->m_error = GSOCK_NOHOST;
     return GSOCK_NOHOST;
   }
     address->m_error = GSOCK_NOHOST;
     return GSOCK_NOHOST;
   }


@@ -1241,13 +1243,14 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
 
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
 
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {

+  address->m_len  = sizeof(struct sockaddr_un);

   address->m_addr = (struct sockaddr *)malloc(address->m_len);
   address->m_addr = (struct sockaddr *)malloc(address->m_len);

-  if (address->m_addr == NULL) {
+  if (address->m_addr == NULL)
+  {

     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 

-  address->m_len  = sizeof(struct sockaddr_un);

   address->m_family = GSOCK_UNIX;
   address->m_realfamily = PF_UNIX;
   ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;
   address->m_family = GSOCK_UNIX;
   address->m_realfamily = PF_UNIX;
   ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;