Created static utility library

include/OpenRaider.h

@@ -20,6 +20,7 @@
 #include "SDLSystem.h"
 #include "Network.h"
 #include "World.h"
+#include "utils/strings.h"
 
 /*!
  * \brief OpenRaider key events.

include/System.h

@@ -14,6 +14,7 @@
 #include <map>
 
 #include "Vector.h"
+#include "utils/strings.h"
 
 //! \todo Replace with unicode compatible key codes
 #define SYS_MOUSE_LEFT    6000
@@ -67,37 +68,6 @@ public:
     virtual ~System();
 
     /*!
-     * \brief Generates a buffered string for the printf call
-     * \param string Format string like for printf
-     * \returns string in a buffer
-     */
-    static char *bufferString(const char *string, ...) __attribute__((format(printf, 1, 2)));
-
-    /*!
-     * \brief Expansion of unix home enviroment char.
-     * Also makes sure string ends in "end" char.
-     * \param path path string
-     * \param end end character. 0 appends no additional char
-     * \returns allocated string of path with expansions
-     */
-    static char *fullPath(const char *path, char end);
-
-    /*!
-     * \brief Only returns last part of a path string.
-     * \param filename Path to a file
-     * \returns Name of the file in filename, without path in front
-     */
-    static char *getFileFromFullPath(char *filename);
-
-    /*!
-     * \brief Check if a string ends with another string.
-     * \param str string to check
-     * \param suffix suffix for which to check
-     * \returns true if str ends with suffix
-     */
-    static bool stringEndsWith(const char *str, const char *suffix);
-
-    /*!
      * \brief Gets the game tick
      * \returns number of milliseconds since start of program
      */
@@ -211,27 +181,9 @@ protected:
     unsigned int mConsoleKey;          //!< Console toggle event now handled lower
 };
 
-
 //! \todo Could make these static methods later, depends on API evolution
 
 /*!
- * \brief Checks if Command matches Symbol.
- * Returns the rest of the argument list back in command buffer, if any
- * \param symbol command string
- * \param command with arguments
- * \returns true if command matches symbol
- */
-bool rc_command(const char *symbol, char *command);
-
-/*!
- * \brief Interpret a string as a bool
- * \param buffer "true" or "false"
- * \param val is set to boolean interpretation of buffer
- * \returns -1 for null string, -2 if string is not "true" or "false"
- */
-int rc_get_bool(char *buffer, bool *val);
-
-/*!
  * \brief Sets timer state and returns number of ticks
  * \param state 0 - reset, 1 - get number of ticks
  * \returns number of ticks

include/utils/strings.h

@@ -0,0 +1,60 @@
+/*!
+ * \file include/utils/strings.h
+ * \brief String handling utilities
+ *
+ * \author xythobuz
+ */
+
+#ifndef _UTILS_STRINGS_H_
+#define _UTILS_STRINGS_H_
+
+
+/*!
+ * \brief Generates a buffered string for the printf call
+ * \param string Format string like for printf
+ * \returns string in a buffer
+ */
+char *bufferString(const char *string, ...) __attribute__((format(printf, 1, 2)));
+
+/*!
+ * \brief Expansion of unix home enviroment char.
+ * Also makes sure string ends in "end" char.
+ * \param path path string
+ * \param end end character. 0 appends no additional char
+ * \returns allocated string of path with expansions
+ */
+char *fullPath(const char *path, char end);
+
+/*!
+ * \brief Only returns last part of a path string.
+ * \param filename Path to a file
+ * \returns Name of the file in filename, without path in front
+ */
+char *getFileFromFullPath(char *filename);
+
+/*!
+ * \brief Check if a string ends with another string.
+ * \param str string to check
+ * \param suffix suffix for which to check
+ * \returns true if str ends with suffix
+ */
+bool stringEndsWith(const char *str, const char *suffix);
+
+/*!
+ * \brief Checks if Command matches Symbol.
+ * Returns the rest of the argument list back in command buffer, if any
+ * \param symbol command string
+ * \param command with arguments
+ * \returns true if command matches symbol
+ */
+bool rc_command(const char *symbol, char *command);
+
+/*!
+ * \brief Interpret a string as a bool
+ * \param buffer "true" or "false"
+ * \param val is set to boolean interpretation of buffer
+ * \returns -1 for null string, -2 if string is not "true" or "false"
+ */
+int rc_get_bool(char *buffer, bool *val);
+
+#endif

src/CMakeLists.txt

@@ -50,6 +50,9 @@ endif (APPLE)
 
 #################################################################
 
+# Add utils directory
+add_subdirectory (utils)
+
 # Add Executable
 add_executable (OpenRaider MACOSX_BUNDLE ${SRCS})
 
@@ -165,6 +168,9 @@ set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 find_package (Threads REQUIRED)
 set (LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
+# Add utils Library
+set (LIBS ${LIBS} utilities)
+
 # Link to all found libs
 target_link_libraries (OpenRaider ${LIBS})
 

src/System.cpp

@@ -73,163 +73,6 @@ System::~System()
 // Public Accessors
 ////////////////////////////////////////////////////////////
 
-bool System::stringEndsWith(const char *str, const char *suffix) {
-    if (!str || !suffix)
-        return false;
-
-    size_t lenstr = strlen(str);
-    size_t lensuffix = strlen(suffix);
-
-    if (lensuffix > lenstr)
-        return false;
-
-    return strncmp(str + lenstr - lensuffix, suffix, lensuffix) == 0;
-}
-
-char *System::bufferString(const char *string, ...)
-{
-    int sz = 60;
-    int n;
-    char *text;
-    va_list args;
-
-
-    // Mongoose 2002.01.01, Only allow valid strings
-    //   we must assume it's NULL terminated also if it passes...
-    if (!string || !string[0])
-    {
-        return NULL;
-    }
-
-    text = new char[sz];
-
-    va_start(args, string);
-
-    // Mongoose 2002.01.01, Get exact size needed if the first try fails
-    n = vsnprintf(text, sz, string, args);
-
-    // Mongoose 2002.01.01, Realloc correct amount if truncated
-    while (1)
-    {
-        if (n > -1 && n < sz)
-        {
-            break;
-        }
-
-        // Mongoose 2002.01.01, For glibc 2.1
-        if (n > -1)
-        {
-            sz = n + 1;
-            delete [] text;
-            text = new char[sz];
-            n = vsnprintf(text, sz, string, args);
-            break;
-        }
-        else // glibc 2.0
-        {
-            sz *= 2;
-            delete [] text;
-            text = new char[sz];
-            n = vsnprintf(text, sz, string, args);
-        }
-    }
-
-    va_end(args);
-
-    return text;
-}
-
-
-char *System::fullPath(const char *path, char end)
-{
-    unsigned int i, lenPath, lenEnv, len;
-    char *env, *dir;
-
-
-    if (!path || !path[0])
-        return 0;
-
-    if (path[0] == '~')
-    {
-#if defined(unix) || defined(__APPLE__)
-        env = getenv("HOME");
-
-        if (!env || !env[0])
-        {
-            return 0;
-        }
-
-        lenEnv = strlen(env);
-        lenPath = strlen(path);
-        len = lenEnv + lenPath;
-
-        dir = new char[len+1];
-
-        // Mongoose 2002.08.17, Copy ENV,  strip '~', append rest of path
-        for (i = 0; i < len; ++i)
-        {
-            if (i < lenEnv)
-            {
-                dir[i] = env[i];
-            }
-            else
-            {
-                dir[i] = path[1+(i-lenEnv)];
-            }
-        }
-#else
-#error Platform not supported!
-#endif
-    }
-    else
-    {
-        lenPath = strlen(path);
-        dir = new char[lenPath+1];
-        strncpy(dir, path, lenPath);
-
-        i = lenPath;
-    }
-
-    // Make sure ends in "end" char
-    if (end && dir[i-1] != end)
-    {
-        dir[i++] = end;
-    }
-
-    dir[i] = 0;
-
-    return dir;
-}
-
-
-char *System::getFileFromFullPath(char *filename)
-{
-    int i, j, len;
-    char *str;
-
-
-    len = strlen(filename);
-
-    for (i = len, j = 0; i > 0; --i, ++j)
-    {
-        if (filename[i] == '/' || filename[i] == '\\')
-            break;
-    }
-
-    j--;
-
-    str = new char[len - j + 1];
-
-    for (i = 0; i < len - j; ++i)
-    {
-        str[i] = filename[i + len - j];
-    }
-
-    str[i] = 0;
-
-    return str;
-}
-
 
 unsigned int System::getTicks()
 {
@@ -568,55 +411,6 @@ void System::resizeGL(unsigned int w, unsigned int h)
 // Gobal helper functions
 ////////////////////////////////////////////////////////////
 
-// Mongoose 2002.03.23, Checks command to see if it's same
-//   as symbol, then returns the arg list in command buffer
-bool rc_command(const char *symbol, char *command)
-{
-    int i, j, lens, lenc;
-
-
-    if (!symbol || !symbol[0] || !command || !command[0])
-    {
-        return false;
-    }
-
-    lens = strlen(symbol);
-
-    if (strncmp(command, symbol, lens) == 0)
-    {
-        lenc = strlen(command);
-
-        // lens+1 skips '=' or ' '
-        for (i = 0, j = lens+1; j < lenc; ++i, ++j)
-        {
-            command[i] = command[j];
-            command[i+1] = 0;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-
-int rc_get_bool(char *buffer, bool *val)
-{
-    if (!buffer || !buffer[0])
-    {
-        return -1;
-    }
-
-    if ((strncmp(buffer, "true", 4) == 0) || (buffer[0] == '1'))
-        *val = true;
-    else if ((strncmp(buffer, "false", 5) == 0) || (buffer[0] == '0'))
-        *val = false;
-    else
-        return -2;
-
-    return 0;
-}
-
 
 unsigned int system_timer(int state)
 {

src/utils/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Source files
+set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
+
+# Include directory
+include_directories ("${PROJECT_SOURCE_DIR}/include")
+
+# Add library
+add_library (utilities ${UTIL_SRCS})

src/utils/strings.cpp

@@ -0,0 +1,220 @@
+/*!
+ * \file include/utils/strings.h
+ * \brief String handling utilities
+ *
+ * \author xythobuz
+ */
+
+#include <cstdarg>
+#include <cstdlib>
+#include <stdio.h>
+#include <string.h>
+
+#include "utils/strings.h"
+
+bool stringEndsWith(const char *str, const char *suffix) {
+    if (!str || !suffix)
+        return false;
+
+    size_t lenstr = strlen(str);
+    size_t lensuffix = strlen(suffix);
+
+    if (lensuffix > lenstr)
+        return false;
+
+    return strncmp(str + lenstr - lensuffix, suffix, lensuffix) == 0;
+}
+
+char *bufferString(const char *string, ...)
+{
+    int sz = 60;
+    int n;
+    char *text;
+    va_list args;
+
+
+    // Mongoose 2002.01.01, Only allow valid strings
+    //   we must assume it's NULL terminated also if it passes...
+    if (!string || !string[0])
+    {
+        return NULL;
+    }
+
+    text = new char[sz];
+
+    va_start(args, string);
+
+    // Mongoose 2002.01.01, Get exact size needed if the first try fails
+    n = vsnprintf(text, sz, string, args);
+
+    // Mongoose 2002.01.01, Realloc correct amount if truncated
+    while (1)
+    {
+        if (n > -1 && n < sz)
+        {
+            break;
+        }
+
+        // Mongoose 2002.01.01, For glibc 2.1
+        if (n > -1)
+        {
+            sz = n + 1;
+            delete [] text;
+            text = new char[sz];
+            n = vsnprintf(text, sz, string, args);
+            break;
+        }
+        else // glibc 2.0
+        {
+            sz *= 2;
+            delete [] text;
+            text = new char[sz];
+            n = vsnprintf(text, sz, string, args);
+        }
+    }
+
+    va_end(args);
+
+    return text;
+}
+
+
+char *fullPath(const char *path, char end)
+{
+    unsigned int i, lenPath, lenEnv, len;
+    char *env, *dir;
+
+
+    if (!path || !path[0])
+        return 0;
+
+    if (path[0] == '~')
+    {
+#if defined(unix) || defined(__APPLE__)
+        env = getenv("HOME");
+
+        if (!env || !env[0])
+        {
+            return 0;
+        }
+
+        lenEnv = strlen(env);
+        lenPath = strlen(path);
+        len = lenEnv + lenPath;
+
+        dir = new char[len+1];
+
+        // Mongoose 2002.08.17, Copy ENV,  strip '~', append rest of path
+        for (i = 0; i < len; ++i)
+        {
+            if (i < lenEnv)
+            {
+                dir[i] = env[i];
+            }
+            else
+            {
+                dir[i] = path[1+(i-lenEnv)];
+            }
+        }
+#else
+#error Platform not supported!
+#endif
+    }
+    else
+    {
+        lenPath = strlen(path);
+        dir = new char[lenPath+1];
+        strncpy(dir, path, lenPath);
+
+        i = lenPath;
+    }
+
+    // Make sure ends in "end" char
+    if (end && dir[i-1] != end)
+    {
+        dir[i++] = end;
+    }
+
+    dir[i] = 0;
+
+    return dir;
+}
+
+
+char *getFileFromFullPath(char *filename)
+{
+    int i, j, len;
+    char *str;
+
+
+    len = strlen(filename);
+
+    for (i = len, j = 0; i > 0; --i, ++j)
+    {
+        if (filename[i] == '/' || filename[i] == '\\')
+            break;
+    }
+
+    j--;
+
+    str = new char[len - j + 1];
+
+    for (i = 0; i < len - j; ++i)
+    {
+        str[i] = filename[i + len - j];
+    }
+
+    str[i] = 0;
+
+    return str;
+}
+
+// Mongoose 2002.03.23, Checks command to see if it's same
+//   as symbol, then returns the arg list in command buffer
+bool rc_command(const char *symbol, char *command)
+{
+    int i, j, lens, lenc;
+
+
+    if (!symbol || !symbol[0] || !command || !command[0])
+    {
+        return false;
+    }
+
+    lens = strlen(symbol);
+
+    if (strncmp(command, symbol, lens) == 0)
+    {
+        lenc = strlen(command);
+
+        // lens+1 skips '=' or ' '
+        for (i = 0, j = lens+1; j < lenc; ++i, ++j)
+        {
+            command[i] = command[j];
+            command[i+1] = 0;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+
+int rc_get_bool(char *buffer, bool *val)
+{
+    if (!buffer || !buffer[0])
+    {
+        return -1;
+    }
+
+    if ((strncmp(buffer, "true", 4) == 0) || (buffer[0] == '1'))
+        *val = true;
+    else if ((strncmp(buffer, "false", 5) == 0) || (buffer[0] == '0'))
+        *val = false;
+    else
+        return -2;
+
+    return 0;
+}
+