Made mkdir more UNC path-friendly

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 1e126d81afc988d951dd6d5855648791295f187e..93e0ab3266d5e4304224140b1eda9eef19ed2402 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -30,21 +30,21 @@
 #include <memory.h>
 #endif
 
 #include <memory.h>
 #endif
 

-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/gsocket.h>
-#include <wx/sckaddr.h>
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/gsocket.h"
+#include "wx/sckaddr.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)

 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif

-#endif

 
 // ---------------------------------------------------------------------------
 // wxIPV4address
 
 // ---------------------------------------------------------------------------
 // wxIPV4address


@@ -101,7 +101,14 @@ wxIPV4address::~wxIPV4address()
 
 bool wxIPV4address::Hostname(const wxString& name)
 {
 
 bool wxIPV4address::Hostname(const wxString& name)
 {

-  return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR);
+  // Some people are sometimes fool.
+  if (name == wxT("")) 
+  {
+    wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
+    return FALSE;
+  }
+
+  return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);

 }
 
 bool wxIPV4address::Hostname(unsigned long addr)
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)


@@ -111,7 +118,7 @@ bool wxIPV4address::Hostname(unsigned long addr)
 
 bool wxIPV4address::Service(const wxString& name)
 {
 
 bool wxIPV4address::Service(const wxString& name)
 {

-  return (GAddress_INET_SetPortName(m_address, name.fn_str(), "tcp") == GSOCK_NOERROR);
+  return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR);

 }
 
 bool wxIPV4address::Service(unsigned short port)
 }
 
 bool wxIPV4address::Service(unsigned short port)


@@ -124,6 +131,11 @@ bool wxIPV4address::LocalHost()
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 

+bool wxIPV4address::AnyAddress()
+{
+  return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR);
+}
+

 wxString wxIPV4address::Hostname()
 {
    char hostname[1024];
 wxString wxIPV4address::Hostname()
 {
    char hostname[1024];


@@ -189,7 +201,7 @@ unsigned short wxIPV6address::Service()
 
 #endif
 
 
 #endif
 

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)

 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------