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

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index ed22f2c0..5e63c31f 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1244,6 +1244,55 @@ char *getStringToLower(const char *s)
   return s_copy;
 }
 
+static char *getStringVPrint(char *format, va_list ap)
+{
+  char s[MAX_LINE_LEN];
+
+  vsnprintf(s, MAX_LINE_LEN, format, ap);	// may truncate output string
+
+  return getStringCopy(s);
+}
+
+char *getStringPrint(char *format, ...)
+{
+  va_list ap;
+  char *s;
+
+  va_start(ap, format);
+  s = getStringVPrint(format, ap);
+  va_end(ap);
+
+  return s;
+}
+
+void setStringPrint(char **s, char *format, ...)
+{
+  va_list ap;
+
+  checked_free(*s);
+
+  va_start(ap, format);
+  *s = getStringVPrint(format, ap);
+  va_end(ap);
+}
+
+void appendStringPrint(char **s_old, char *format, ...)
+{
+  va_list ap;
+  char *s_new;
+
+  va_start(ap, format);
+  s_new = getStringVPrint(format, ap);
+  va_end(ap);
+
+  char *s_combined = getStringCat2(*s_old, s_new);
+
+  checked_free(*s_old);
+  checked_free(s_new);
+
+  *s_old = s_combined;
+}
+
 void setString(char **old_value, const char *new_value)
 {
   checked_free(*old_value);
@@ -1333,6 +1382,86 @@ void freeStringArray(char **s_array)
   checked_free(s_array);
 }
 
+char *getEscapedString(const char *s)
+{
+  const unsigned char *s_ptr = (unsigned char *)s;
+  char *s_escaped;
+  char *s_escaped_ptr;
+
+  if (s == NULL)
+    return NULL;
+
+  /* Each source byte needs maximally four target chars (\777) */
+  s_escaped = checked_malloc(strlen(s) * 4 + 1);
+  s_escaped_ptr = s_escaped;
+
+  while (*s_ptr != '\0')
+  {
+    switch (*s_ptr)
+    {
+      case '\b':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = 'b';
+	break;
+
+      case '\f':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = 'f';
+	break;
+
+      case '\n':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = 'n';
+	break;
+
+      case '\r':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = 'r';
+	break;
+
+      case '\t':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = 't';
+	break;
+
+      case '\v':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = 'v';
+	break;
+
+      case '\\':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = '\\';
+	break;
+
+      case '"':
+	*s_escaped_ptr++ = '\\';
+	*s_escaped_ptr++ = '"';
+	break;
+
+      default:
+	if ((*s_ptr < ' ') || (*s_ptr >= 0177))
+	{
+	  *s_escaped_ptr++ = '\\';
+	  *s_escaped_ptr++ = '0' + (((*s_ptr) >> 6) & 07);
+	  *s_escaped_ptr++ = '0' + (((*s_ptr) >> 3) & 07);
+	  *s_escaped_ptr++ = '0' + ( (*s_ptr)       & 07);
+	}
+	else
+	{
+	  *s_escaped_ptr++ = *s_ptr;
+	}
+	break;
+    }
+
+    s_ptr++;
+  }
+
+  *s_escaped_ptr = '\0';
+
+  return s_escaped;
+}
+
 char *getUnescapedString(const char *s)
 {
   const char *s_ptr = s;
@@ -2826,7 +2955,7 @@ boolean get_boolean_from_string(char *s)
   return result;
 }
 
-int get_switch3_from_string(char *s)
+int get_switch_3_state_from_string(char *s)
 {
   char *s_lower = getStringToLower(s);
   int result = FALSE;
@@ -2837,7 +2966,9 @@ int get_switch3_from_string(char *s)
       get_integer_from_string(s) == 1)
     result = TRUE;
   else if (strEqual(s_lower, "auto"))
-    result = AUTO;
+    result = STATE_AUTO;
+  else if (strEqual(s_lower, "ask"))
+    result = STATE_ASK;
 
   free(s_lower);
 
@@ -2969,7 +3100,7 @@ static void dumpList(ListNode *node_first)
 
 #define MAX_BUFFER_SIZE			4096
 
-File *openFile(char *filename, char *mode)
+File *openFile(const char *filename, const char *mode)
 {
   File *file = checked_calloc(sizeof(File));
 
@@ -3125,7 +3256,7 @@ char *getStringFromFile(File *file, char *line, int size)
   return fgets(line, size, file->file);
 }
 
-int copyFile(char *filename_from, char *filename_to)
+int copyFile(const char *filename_from, const char *filename_to)
 {
   File *file_from, *file_to;
 
@@ -3155,7 +3286,7 @@ int copyFile(char *filename_from, char *filename_to)
   return 0;
 }
 
-boolean touchFile(char *filename)
+boolean touchFile(const char *filename)
 {
   FILE *file;