X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=ed22f2c09544dcdd8ed45818a44bf7349edd024f;hb=45b6628e4a1d3bf3bea5fdca794af788ceabd053;hp=0f4cab0369c9f2044c9794946bd57810ef066036;hpb=861cfc1e558b662eb474a7b0dbc7e406eea2fa9e;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 0f4cab03..ed22f2c0 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);
 }
@@ -1220,6 +1220,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 +1307,160 @@ 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;
+
+  if (s_array == NULL)
+    return;
+
+  for (i = 0; s_array[i] != NULL; i++)
+    checked_free(s_array[i]);
+
+  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;
+}
+
+char *chugString(char *s)
+{
+  if (s == NULL)
+    return NULL;
+
+  char *start;
+
+  for (start = (char *)s; *start && isspace(*start); start++)
+    ;
+
+  memmove(s, start, strlen(start) + 1);
+
+  return s;
+}
+
+char *chompString(char *s)
+{
+  if (s == NULL)
+    return NULL;
+
+  int len = strlen(s);
+
+  while (len--)
+  {
+    if (isspace(s[len]))
+      s[len] = '\0';
+    else
+      break;
+  }
+
+  return s;
+}
+
+char *stripString(char *s)
+{
+  return chugString(chompString(s));
+}
+
 boolean strEqual(const char *s1, const char *s2)
 {
   return (s1 == NULL && s2 == NULL ? TRUE  :
@@ -1718,6 +1884,19 @@ void clear_mem(void *ptr, unsigned int size)
 #endif
 }
 
+void *get_memcpy(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 helper functions