Виправлено роботу з перекодуванням рядків

[stg.git] / stglibs / common.lib / common.cpp

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index a5899dd2c2fdaaea9311b2ef3b1a81a648ab7ca9..37ce079d290b9c9877b7871ed85dcaf9851b85b1 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -23,8 +23,8 @@
  */
 
  /*
  */
 
  /*

- $Revision: 1.41 $
- $Date: 2010/11/03 10:26:30 $
+ $Revision: 1.42 $
+ $Date: 2010/11/08 10:11:19 $

  $Author: faust $
  */
 
  $Author: faust $
  */
 


@@ -54,9 +54,18 @@
 #include <sys/socket.h>
 #endif*/
 
 #include <sys/socket.h>
 #endif*/
 

+#ifdef FREE_BSD
+#include <sys/types.h>
+#endif
+
+#ifdef WIN32
+#include <winsock2.h>
+#else

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

+#endif
+

 #include <iconv.h>
 
 #include <cstdlib>
 #include <iconv.h>
 
 #include <cstdlib>


@@ -74,6 +83,44 @@
 
 using namespace std;
 
 
 using namespace std;
 

+#ifdef WIN32
+//-----------------------------------------------------------------------------
+const char * inet_ntop(int af, const void * src, char * dst, unsigned long length)
+{
+struct sockaddr_in addr;
+addr.sin_family = af;
+addr.sin_port = 0;
+memcpy(&addr.sin_addr.s_addr, src, sizeof(addr.sin_addr.s_addr));
+if (WSAAddressToStringA(reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr), 0, dst, &length))
+    {
+    return NULL;
+    }
+return dst;
+}
+//-----------------------------------------------------------------------------
+int inet_pton(int af, const char * src, void * dst)
+{
+// Fuck you Microsoft!
+// Why the hell not to use const char *?
+size_t slen = strlen(src);
+char * buf = new char[slen + 1];
+strncpy(buf, src, slen + 1);
+buf[slen] = 0;
+struct sockaddr_in addr;
+addr.sin_family = af;
+addr.sin_port = 0;
+addr.sin_addr.s_addr = 0;
+int length = sizeof(addr);
+if (WSAStringToAddressA(buf, af, 0, reinterpret_cast<struct sockaddr *>(&addr), &length))
+    {
+    delete[] buf;
+    return -1;
+    }
+memcpy(dst, &addr, sizeof(addr));
+delete[] buf;
+return 1;
+}
+#endif

 //-----------------------------------------------------------------------------
 int strtodouble2(const char * s, double &a)
 {
 //-----------------------------------------------------------------------------
 int strtodouble2(const char * s, double &a)
 {


@@ -406,7 +453,7 @@ for (int i = 0; i < maxIP; i++)
         }
 
     struct in_addr in;
         }
 
     struct in_addr in;

-    if (!inet_aton(p1, &in))
+    if (inet_pton(AF_INET, p1, &in) != 1)

         {
         //printf("INADDR_NONE\n");
         return EINVAL;
         {
         //printf("INADDR_NONE\n");
         return EINVAL;


@@ -734,6 +781,27 @@ if (errno == ERANGE)
 return 0;
 }
 //---------------------------------------------------------------------------
 return 0;
 }
 //---------------------------------------------------------------------------

+int str2x(const std::string & str, long & x)
+{
+x = strtol(str.c_str(), NULL, 10);
+
+if (errno == ERANGE)
+    return -1;
+
+return 0;
+}
+//---------------------------------------------------------------------------
+int str2x(const std::string & str, unsigned long & x)
+{
+x = strtoul(str.c_str(), NULL, 10);
+
+if (errno == ERANGE)
+    return -1;
+
+return 0;
+}
+#ifndef WIN32
+//---------------------------------------------------------------------------

 int str2x(const std::string & str, long long & x)
 {
 x = strtoll(str.c_str(), NULL, 10);
 int str2x(const std::string & str, long long & x)
 {
 x = strtoll(str.c_str(), NULL, 10);


@@ -753,12 +821,18 @@ if (errno == ERANGE)
 
 return 0;
 }
 
 return 0;
 }

+#endif

 //---------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s)
 {
 return unsigned2str(x, s);
 }
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 const std::string & x2str(unsigned x, std::string & s)
 {
 return unsigned2str(x, s);
 }
 //---------------------------------------------------------------------------

+const std::string & x2str(unsigned long x, std::string & s)
+{
+return unsigned2str(x, s);
+}
+//---------------------------------------------------------------------------

 const std::string & x2str(unsigned long long x, std::string & s)
 {
 return unsigned2str(x, s);
 const std::string & x2str(unsigned long long x, std::string & s)
 {
 return unsigned2str(x, s);


@@ -793,8 +867,35 @@ std::string & Trim(std::string & val)
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------

+#ifdef WIN32
+static int is_leap(unsigned y)
+{
+    y += 1900;
+    return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
+}
+#endif
+//---------------------------------------------------------------------------
+

 time_t stg_timegm(struct tm * brokenTime)
 {
 time_t stg_timegm(struct tm * brokenTime)
 {

+#ifdef WIN32
+static const unsigned ndays[2][12] ={
+    {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
+    {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
+time_t res = 0;
+for (int i = 70; i < brokenTime->tm_year; ++i)
+    res += is_leap(i) ? 366 : 365;
+for (int i = 0; i < brokenTime->tm_mon; ++i)
+    res += ndays[is_leap(brokenTime->tm_year)][i];
+res += brokenTime->tm_mday - 1;
+res *= 24;
+res += brokenTime->tm_hour;
+res *= 60;
+res += brokenTime->tm_min;
+res *= 60;
+res += brokenTime->tm_sec;
+return res;
+#else

 #ifdef HAVE_TIMEGM
 return timegm(brokenTime);
 #else
 #ifdef HAVE_TIMEGM
 return timegm(brokenTime);
 #else


@@ -810,7 +911,8 @@ else
     unsetenv("TZ");
 tzset();
 return ret;
     unsetenv("TZ");
 tzset();
 return ret;

-#endif
+#endif // HAVE_TIMEGM
+#endif // WIN32

 }
 //---------------------------------------------------------------------------
 std::string IconvString(const std::string & source,
 }
 //---------------------------------------------------------------------------
 std::string IconvString(const std::string & source,


@@ -830,7 +932,7 @@ strncpy(inBuf, source.c_str(), source.length());
 
 inBuf[source.length()] = 0;
 
 
 inBuf[source.length()] = 0;
 

-#if defined(FREE_BSD) || defined(FREE_BSD5)
+#if defined(FREE_BSD) || defined(FREE_BSD5) || defined(WIN32)

 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;
 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;