+Sat Jul 31 20:33:07 2004 Matthias Clasen <maclas@gmx.de>
+
+ * tests/shell-test.c: Include a test involving consecutive
+ backslashes followed by a non-escaped doublequote.
+
+ * glib/gshell.c (tokenize_command_line): Count consecutive
+ backslashes mod 2 to detect escaped doubleqotes. (#127306)
+
2004-07-30 Matthias Clasen <mclasen@redhat.com>
* glib/gconvert.c (g_unescape_uri_string): Don't validate
+Sat Jul 31 20:33:07 2004 Matthias Clasen <maclas@gmx.de>
+
+ * tests/shell-test.c: Include a test involving consecutive
+ backslashes followed by a non-escaped doublequote.
+
+ * glib/gshell.c (tokenize_command_line): Count consecutive
+ backslashes mod 2 to detect escaped doubleqotes. (#127306)
+
2004-07-30 Matthias Clasen <mclasen@redhat.com>
* glib/gconvert.c (g_unescape_uri_string): Don't validate
+Sat Jul 31 20:33:07 2004 Matthias Clasen <maclas@gmx.de>
+
+ * tests/shell-test.c: Include a test involving consecutive
+ backslashes followed by a non-escaped doublequote.
+
+ * glib/gshell.c (tokenize_command_line): Count consecutive
+ backslashes mod 2 to detect escaped doubleqotes. (#127306)
+
2004-07-30 Matthias Clasen <mclasen@redhat.com>
* glib/gconvert.c (g_unescape_uri_string): Don't validate
+Sat Jul 31 20:33:07 2004 Matthias Clasen <maclas@gmx.de>
+
+ * tests/shell-test.c: Include a test involving consecutive
+ backslashes followed by a non-escaped doublequote.
+
+ * glib/gshell.c (tokenize_command_line): Count consecutive
+ backslashes mod 2 to detect escaped doubleqotes. (#127306)
+
2004-07-30 Matthias Clasen <mclasen@redhat.com>
* glib/gconvert.c (g_unescape_uri_string): Don't validate
+Sat Jul 31 20:33:07 2004 Matthias Clasen <maclas@gmx.de>
+
+ * tests/shell-test.c: Include a test involving consecutive
+ backslashes followed by a non-escaped doublequote.
+
+ * glib/gshell.c (tokenize_command_line): Count consecutive
+ backslashes mod 2 to detect escaped doubleqotes. (#127306)
+
2004-07-30 Matthias Clasen <mclasen@redhat.com>
* glib/gconvert.c (g_unescape_uri_string): Don't validate
const gchar *p;
GString *current_token = NULL;
GSList *retval = NULL;
-
+ gboolean quoted;;
+
current_quote = '\0';
+ quoted = FALSE;
p = command_line;
-
+
while (*p)
{
if (current_quote == '\\')
{
if (*p == current_quote &&
/* check that it isn't an escaped double quote */
- !(current_quote == '"' && p != command_line && *(p - 1) == '\\'))
+ !(current_quote == '"' && quoted))
{
/* close the quote */
current_quote = '\0';
}
}
+ /* We need to count consecutive backslashes mod 2,
+ * to detect escaped doublequotes.
+ */
+ if (*p != '\\')
+ quoted = FALSE;
+ else
+ quoted = !quoted;
+
++p;
}
/* 9 */ "foo \\\" la la la",
/* 10 */ "foo \\ foo woo woo\\ ",
/* 11 */ "foo \"yada yada \\$\\\"\"",
+ /* 12 */ "foo \"c:\\\\\"",
NULL
};
static const gchar *result9[] = { "foo", "\"", "la", "la", "la", NULL };
static const gchar *result10[] = { "foo", " foo", "woo", "woo ", NULL };
static const gchar *result11[] = { "foo", "yada yada $\"", NULL };
+static const gchar *result12[] = { "foo", "c:\\", NULL };
static const TestResult
correct_results[] =
{ G_N_ELEMENTS (result8) - 1, result8 },
{ G_N_ELEMENTS (result9) - 1, result9 },
{ G_N_ELEMENTS (result10) - 1, result10 },
- { G_N_ELEMENTS (result11) - 1, result11 }
+ { G_N_ELEMENTS (result11) - 1, result11 },
+ { G_N_ELEMENTS (result12) - 1, result12 }
};
static void