luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 22:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in g_shell_parse_argv()

Browse Source 
The commit in 6e4acf44b3a943906432a2bf55223ac107d8e0c2 broke
the fallthrough case for '\\' when it changed the '#' case.

This caused issues like this:
  https://bugzilla.gnome.org/show_bug.cgi?id=683821

https://bugzilla.gnome.org/show_bug.cgi?id=562907
This commit is contained in:
Alexander Larsson 2012-09-13 10:13:04 +02:00
parent d6b9df6949
commit c99acf51d0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gshell.c
View File

@ -518,7 +518,10 @@ tokenize_command_line (const gchar *command_line,
g_string_append_c (current_token, *p); g_string_append_c (current_token, *p);
/* FALL THRU */ /* FALL THRU */
case '\\':
current_quote = *p;
break;
case '#': case '#':
if (p == command_line) if (p == command_line)
{ /* '#' was the first char */ { /* '#' was the first char */
@ -538,9 +541,6 @@ tokenize_command_line (const gchar *command_line,
break; break;
} }
break; break;
case '\\':
current_quote = *p;
break;
default: default:
/* Combines rules 4) and 6) - if we have a token, append to it, /* Combines rules 4) and 6) - if we have a token, append to it,

3
glib/tests/shell.c
View File

@ -66,7 +66,8 @@ static CmdlineTest cmdline_tests[] =
{ "foo '\"bar\" baz", 0, { NULL }, G_SHELL_ERROR_BAD_QUOTING }, { "foo '\"bar\" baz", 0, { NULL }, G_SHELL_ERROR_BAD_QUOTING },
{ "", 0, { NULL }, G_SHELL_ERROR_EMPTY_STRING }, { "", 0, { NULL }, G_SHELL_ERROR_EMPTY_STRING },
{ " ", 0, { NULL }, G_SHELL_ERROR_EMPTY_STRING }, { " ", 0, { NULL }, G_SHELL_ERROR_EMPTY_STRING },
{ "# foo bar", 0, { NULL }, G_SHELL_ERROR_EMPTY_STRING } { "# foo bar", 0, { NULL }, G_SHELL_ERROR_EMPTY_STRING },
{"foo '/bar/summer'\\''09 tours.pdf'", 2, {"foo", "/bar/summer'09 tours.pdf", NULL}, -1}
}; };
static gboolean static gboolean