Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index 8c3eb1a5e62dee205e800cf2a9cb07ed6dec26da..b527ac588b9ff5d3f2c983b3e967b476b90733dd 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -32,7 +32,8 @@
 // Like FreeBSD4
 #include <sys/types.h>
 #include <sys/time.h>
 // Like FreeBSD4
 #include <sys/types.h>
 #include <sys/time.h>

-#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>

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


@@ -47,6 +48,8 @@
 
 #include <iconv.h>
 
 
 #include <iconv.h>
 

+#include <algorithm>
+

 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>


@@ -750,6 +753,11 @@ if (errno == ERANGE)
 
 return 0;
 }
 
 return 0;
 }

+//---------------------------------------------------------------------------
+int str2x(const std::string & str, double & x)
+{
+return strtodouble2(str.c_str(), x);
+}

 #ifndef WIN32
 //---------------------------------------------------------------------------
 int str2x(const std::string & str, int64_t & x)
 #ifndef WIN32
 //---------------------------------------------------------------------------
 int str2x(const std::string & str, int64_t & x)


@@ -897,7 +905,7 @@ strncpy(inBuf, source.c_str(), source.length());
 
 inBuf[source.length()] = 0;
 
 
 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;
 const char * srcPos = inBuf;
 #else
 char * srcPos = inBuf;


@@ -1072,3 +1080,37 @@ std::string ToPrintable(const std::string & src)
 
     return dest;
 }
 
     return dest;
 }

+
+uid_t str2uid(const std::string& name)
+{
+    const passwd* res = getpwnam(name.c_str());
+    if (res == NULL)
+        return -1;
+    return res->pw_uid;
+}
+
+gid_t str2gid(const std::string& name)
+{
+    const group* res = getgrnam(name.c_str());
+    if (res == NULL)
+        return -1;
+    return res->gr_gid;
+}
+
+mode_t str2mode(const std::string& name)
+{
+    if (name.length() < 3 || name.length() > 4)
+        return -1;
+
+    if (name.length() == 4 && name[0] != '0')
+        return -1;
+
+    mode_t res = 0;
+    for (size_t i = 0; i < name.length(); ++i)
+    {
+        if (name[i] > '7' || name[i] < '0')
+            return -1;
+        res = (res << 3) + (name[i] - '0');
+    }
+    return res;
+}