Merge branch 'stg-2.409'

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

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index c02f675c943c9c93abd6cbb9407eda1d1d84ea32..a4722a00f3e301b9bc84dc6a500552d802dfefbb 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -47,6 +47,8 @@
 
 #include <iconv.h>
 
+#include <algorithm>
+
 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>
@@ -274,10 +276,9 @@ return str;
 //---------------------------------------------------------------------------
 void KOIToWin(const char * s1, char * s2, int l)
 {
-unsigned char t;
 for (int j = 0; j < l; j++)
     {
-    t = s1[j];
+    unsigned char t = s1[j];
     s2[j] = koi2win[t];
 
     if (s1[j] == 0)
@@ -287,10 +288,9 @@ for (int j = 0; j < l; j++)
 //---------------------------------------------------------------------------
 void WinToKOI(const char * s1, char * s2, int l)
 {
-unsigned char t;
 for (int j = 0; j < l; j++)
     {
-    t = s1[j];
+    unsigned char t = s1[j];
     s2[j] = win2koi[t];
 
     if (s1[j] == 0)
@@ -301,11 +301,10 @@ for (int j = 0; j < l; j++)
 void KOIToWin(const std::string & s1, std::string * s2)
 {
 s2->erase(s2->begin(), s2->end());
-unsigned char t;
 s2->reserve(s1.length());
 for (int j = 0; j < (int)s1.length(); j++)
     {
-    t = s1[j];
+    unsigned char t = s1[j];
     s2->push_back(koi2win[t]);
     }
 }
@@ -313,11 +312,10 @@ for (int j = 0; j < (int)s1.length(); j++)
 void WinToKOI(const std::string & s1, std::string * s2)
 {
 s2->erase(s2->begin(), s2->end());
-unsigned char t;
 s2->reserve(s1.length());
 for (int j = 0; j < (int)s1.length(); j++)
     {
-    t = s1[j];
+    unsigned char t = s1[j];
     s2->push_back(win2koi[t]);
     }
 }
@@ -400,11 +398,10 @@ int ParseIPString(const char * str, uint32_t * ips, int maxIP)
  */
 
 char p[255];
-char * p1, *pp;
 int n = 0;
 
 strncpy(p, str, 254);
-pp = p;
+char * pp = p;
 
 memset(ips, 0xFF, sizeof(unsigned long) * maxIP);
 
@@ -416,7 +413,7 @@ if (str[0] == '*' && strlen(str) == 1)
 
 for (int i = 0; i < maxIP; i++)
     {
-    p1 = strtok(pp, ",\n ");
+    char * p1 = strtok(pp, ",\n ");
     pp = NULL;
 
     if (p1 == NULL && n == 0)// ÕËÁÚÁÔÅÌØ ÎÕÌØ É ÐÒÏÞÉÔÁÎÏ ÁÄÒÅÓÏ× ÔÏÖÅ ÎÏÌØ
@@ -517,6 +514,22 @@ uint32_t inet_strington(const std::string & value)
     return result;
 }
 //-----------------------------------------------------------------------------
+std::string TimeToString(time_t time)
+{
+struct tm brokenTime;
+
+brokenTime.tm_wday = 0;
+brokenTime.tm_yday = 0;
+brokenTime.tm_isdst = 0;
+
+gmtime_r(&time, &brokenTime);
+
+char buf[32];
+strftime(buf, 32, "%Y-%m-%d %H:%M:%S", &brokenTime);
+
+return buf;
+}
+//-----------------------------------------------------------------------------
 int ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2)
 {
 char hs1[10], ms1[10], hs2[10], ms2[10];
@@ -663,20 +676,18 @@ strcpy(str, stren);
 //---------------------------------------------------------------------------
 void DecodeStr(char * str, unsigned long serial, int useHDD)
 {
-int len = strlen(str);
+size_t len = strlen(str);
 char strdc[100];
-int i, j = 0;
-char c1, c2;
 char serial_c[sizeof(serial)];
 memcpy(serial_c, &serial, sizeof(serial));
 
-for (i = 0; i < len; i += 2)
+for (size_t i = 0; i < len; i += 2)
     {
-    c1 = (str[i] - 50);
-    c2 = (str[i+1] - 50)<<4;
+    char c1 = (str[i] - 50);
+    char c2 = (str[i+1] - 50)<<4;
     strdc[i/2] = c1+c2;
     }
-for (i = 0; i < len/2; i++)
+for (size_t i = 0; i < len/2; i++)
     {
     if (!useHDD)
         strdc[i] = strdc[i]^49;
@@ -738,6 +749,38 @@ void SwapBytes(int64_t & value)
     value = temp;
 }
 //---------------------------------------------------------------------------
+std::string formatTime(time_t ts)
+{
+char buf[32];
+struct tm brokenTime;
+
+brokenTime.tm_wday = 0;
+brokenTime.tm_yday = 0;
+brokenTime.tm_isdst = 0;
+
+gmtime_r(&ts, &brokenTime);
+
+strftime(buf, 32, "%Y-%m-%d %H:%M:%S", &brokenTime);
+
+return buf;
+}
+//---------------------------------------------------------------------------
+time_t readTime(const std::string & ts)
+{
+if (ts == "0000-00-00 00:00:00")
+    return 0;
+
+struct tm brokenTime;
+
+brokenTime.tm_wday = 0;
+brokenTime.tm_yday = 0;
+brokenTime.tm_isdst = 0;
+
+stg_strptime(ts.c_str(), "%Y-%m-%d %H:%M:%S", &brokenTime);
+
+return stg_timegm(&brokenTime);
+}
+//---------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x)
 {
 x = static_cast<int32_t>(strtol(str.c_str(), NULL, 10));
@@ -790,6 +833,14 @@ const std::string & x2str(uint64_t x, std::string & s)
 return unsigned2str(x, s);
 }
 //---------------------------------------------------------------------------
+const std::string & x2str(double x, std::string & s)
+{
+char buf[256];
+snprintf(buf, sizeof(buf), "%f", x);
+s = buf;
+return s;
+}
+//---------------------------------------------------------------------------
 std::string & TrimL(std::string & val)
 {
 size_t pos = val.find_first_not_of(" \t");
@@ -819,19 +870,21 @@ std::string & Trim(std::string & val)
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------
-std::string ToLower(const std::string & value)
+std::string Trim(const std::string & val)
 {
-    std::string res;
-    for (std::string::size_type pos = 0; pos < value.length(); ++pos)
-        res += tolower(value[pos]);
+std::string res(val);
+return TrimR(TrimL(res));
+}
+//---------------------------------------------------------------------------
+std::string ToLower(std::string value)
+{
+    std::transform(value.begin(), value.end(), value.begin(), ::tolower);
     return value;
 }
 //---------------------------------------------------------------------------
-std::string ToUpper(const std::string & value)
+std::string ToUpper(std::string value)
 {
-    std::string res;
-    for (std::string::size_type pos = 0; pos < value.length(); ++pos)
-        res += toupper(value[pos]);
+    std::transform(value.begin(), value.end(), value.begin(), ::toupper);
     return value;
 }
 //---------------------------------------------------------------------------
@@ -900,7 +953,7 @@ strncpy(inBuf, source.c_str(), source.length());
 
 inBuf[source.length()] = 0;
 
-#if defined(FREE_BSD) || defined(FREE_BSD5) || defined(WIN32)
+#if defined(CONST_ICONV)
 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;
@@ -1030,3 +1083,48 @@ if (res == 0) // Timeout
 
 return true;
 }
+
+bool ReadAll(int sd, void * dest, size_t size)
+{
+size_t done = 0;
+char * ptr = static_cast<char *>(dest);
+while (done < size)
+    {
+    if (!WaitPackets(sd))
+        return false;
+    ssize_t res = read(sd, ptr + done, size - done);
+    if (res < 0)
+        return false;
+    if (res == 0)
+        return true;
+    done += res;
+    }
+return true;
+}
+
+bool WriteAll(int sd, const void * source, size_t size)
+{
+size_t done = 0;
+const char * ptr = static_cast<const char *>(source);
+while (done < size)
+    {
+    ssize_t res = write(sd, ptr + done, size - done);
+    if (res <= 0)
+        return false;
+    done += res;
+    }
+return true;
+}
+
+std::string ToPrintable(const std::string & src)
+{
+    std::string dest;
+
+    for (size_t i = 0; i < src.size(); ++i)
+        if (std::isprint(src[i]))
+            dest += src[i];
+        else
+            dest += "\\" + x2str(src[i]);
+
+    return dest;
+}