diff options
| -rw-r--r-- | epan/prefs.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index b1528d7cf8..d834601a6a 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -3649,7 +3649,6 @@ char *join_string_list(GList *sl) GString *joined_str = g_string_new(""); GList *cur, *first; gchar *str; - gchar *quoted_str; guint item_count = 0; cur = first = g_list_first(sl); @@ -3666,9 +3665,20 @@ char *join_string_list(GList *sl) } else g_string_append_c(joined_str, ' '); - quoted_str = g_strescape(str, ""); - g_string_append_printf(joined_str, "\"%s\"", quoted_str); - g_free(quoted_str); + g_string_append_c(joined_str, '"'); + while (*str) { + gunichar uc = g_utf8_get_char (str); + + if (uc == '"' || uc == '\\') + g_string_append_c(joined_str, '\\'); + + if (g_unichar_isprint(uc)) + g_string_append_unichar (joined_str, uc); + + str = g_utf8_next_char (str); + } + + g_string_append_c(joined_str, '"'); cur = cur->next; } |