Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 55 insertions, 2 deletions

diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index 7c8f91c..602211e 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -48,6 +48,11 @@
   #include <string.h>
 #endif
 
+#ifdef HAVE_CERRNO
+  #include <cerrno>
+#else
+  #include <errno.h>
+#endif
 
 #include <memory>
 #include <algorithm>
@@ -56,14 +61,62 @@
 using std::string;
 using std::transform;
 
+namespace {
+
+int extractLongNumber(const char* in, long long int& out) {
+
+    errno = 0;
+
+    int ret = 0;
+    char* end = 0;
+    long long int result = strtoll(in, &end, 0);
+
+    if (errno == 0 && end != in) {
+        out = result;
+        ret = 1;
+    }
+
+    return ret;
+}
+
+template<typename T>
+int extractNumber(const std::string& in, T& out) {
+
+    long long int result = 0;
+
+    if (::extractLongNumber(in.c_str(), result) && out >= 0) {
+        out = static_cast<T>(result);
+        return 1;
+    }
+
+    return 0;
+}
+
+}
+
+
 namespace FbTk {
 
 namespace StringUtil {
 
+int extractNumber(const std::string& in, int& out) {
+    return ::extractNumber<int>(in, out);
+}
+
+int extractNumber(const std::string& in, unsigned int& out) {
+    return ::extractNumber<unsigned int>(in, out);
+}
+
+std::string number2String(int num) {
+    char s[128];
+    sprintf(s, "%d", num);
+    return std::string(s);
+}
+
 /**
    Tries to find a string in another and
    ignoring the case of the characters
-   Returns 0 on success else pointer to str.
+   Returns 0 on failure else pointer to str.
 */
 const char *strcasestr(const char *str, const char *ptn) {
     const char *s2, *p2;
@@ -142,7 +195,7 @@ string replaceString(const string &original,
    for the position + 1 in the in-string where the "last"-char value
    was found.
 */
-int getStringBetween(string& out, const char *instr, const char first, const char last,
+int getStringBetween(string& out, const char *instr, char first, char last,
                      const char *ok_chars, bool allow_nesting) {
     assert(first);
     assert(last);