X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=c96fa177de8ad5ebfb50cb7daa3242db7654ebe7;hb=ac60e2c46ea31c5dc6a71a393c0ea3fcf60ceb7a;hp=2ef55766ca53113ddd5d1672f2100acef029907b;hpb=c712eddd108764ffbf523830ba2a26869e1453c8;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 2ef55766..c96fa177 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -620,12 +620,12 @@ static unsigned int mainCounter(int mode)
   return current_ms - base_ms;
 }
 
-void InitCounter()		// set counter back to zero
+void InitCounter(void)		// set counter back to zero
 {
   mainCounter(INIT_COUNTER);
 }
 
-unsigned int Counter()	// get milliseconds since last call of InitCounter()
+unsigned int Counter(void)	// get milliseconds since last call of InitCounter()
 {
   return mainCounter(READ_COUNTER);
 }
@@ -1084,6 +1084,24 @@ char *getBasePath(char *filename)
 }
 
 
+// ----------------------------------------------------------------------------
+// various string functions
+// ----------------------------------------------------------------------------
+
+void *getMemCopy(const void *m, size_t size)
+{
+  void *m_copy;
+
+  if (m == NULL)
+    return NULL;
+
+  m_copy = checked_malloc(size);
+  memcpy(m_copy, m, size);
+
+  return m_copy;
+}
+
+
 // ----------------------------------------------------------------------------
 // various string functions
 // ----------------------------------------------------------------------------
@@ -1220,6 +1238,18 @@ char *getStringCopyNStatic(const char *s, int n)
   return s_copy;
 }
 
+char *getStringToUpper(const char *s)
+{
+  char *s_copy = checked_malloc(strlen(s) + 1);
+  char *s_ptr = s_copy;
+
+  while (*s)
+    *s_ptr++ = toupper(*s++);
+  *s_ptr = '\0';
+
+  return s_copy;
+}
+
 char *getStringToLower(const char *s)
 {
   char *s_copy = checked_malloc(strlen(s) + 1);
@@ -1295,6 +1325,19 @@ char **getSplitStringArray(const char *s, const char *separators, int max_tokens
   return tokens;
 }
 
+int getStringArrayLength(char **s_array)
+{
+  int num_strings = 0;
+
+  if (s_array == NULL)
+    return 0;
+
+  while (s_array[num_strings] != NULL)
+    num_strings++;
+
+  return num_strings;
+}
+
 void freeStringArray(char **s_array)
 {
   int i;
@@ -1308,6 +1351,96 @@ void freeStringArray(char **s_array)
   checked_free(s_array);
 }
 
+char *getUnescapedString(const char *s)
+{
+  const char *s_ptr = s;
+  const char *octal_ptr;
+  char *s_unescaped;
+  char *s_unescaped_ptr;
+
+  if (s == NULL)
+    return NULL;
+
+  s_unescaped = checked_malloc(strlen(s) + 1);
+  s_unescaped_ptr = s_unescaped;
+
+  while (*s_ptr != '\0')
+  {
+    if (*s_ptr == '\\')
+    {
+      s_ptr++;
+
+      switch (*s_ptr)
+      {
+	case '\0':
+	  Warn("getUnescapedString: trailing \\");
+	  goto out;
+
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	  *s_unescaped_ptr = 0;
+	  octal_ptr = s_ptr;
+
+	  while (s_ptr < octal_ptr + 3 && *s_ptr >= '0' && *s_ptr <= '7')
+	  {
+	    *s_unescaped_ptr = (*s_unescaped_ptr * 8) + (*s_ptr - '0');
+	    s_ptr++;
+	  }
+
+	  s_unescaped_ptr++;
+	  s_ptr--;
+	  break;
+
+	case 'b':
+	  *s_unescaped_ptr++ = '\b';
+	  break;
+
+	case 'f':
+	  *s_unescaped_ptr++ = '\f';
+	  break;
+
+	case 'n':
+	  *s_unescaped_ptr++ = '\n';
+	  break;
+
+	case 'r':
+	  *s_unescaped_ptr++ = '\r';
+	  break;
+
+	case 't':
+	  *s_unescaped_ptr++ = '\t';
+	  break;
+
+	case 'v':
+	  *s_unescaped_ptr++ = '\v';
+	  break;
+
+	default:
+	  /* also handles \" and \\ */
+	  *s_unescaped_ptr++ = *s_ptr;
+	  break;
+      }
+    }
+    else
+    {
+      *s_unescaped_ptr++ = *s_ptr;
+    }
+
+    s_ptr++;
+  }
+
+ out:
+  *s_unescaped_ptr = '\0';
+
+  return s_unescaped;
+}
+
 boolean strEqual(const char *s1, const char *s2)
 {
   return (s1 == NULL && s2 == NULL ? TRUE  :