nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Correct string/quoted string parsing for the commands exec, workspace, nop, restore and mark (Thanks SardemFF7) 

Fixes: #380
This commit is contained in:
Michael Stapelberg 2011-05-12 07:09:06 +02:00
parent 2e75d934a4
commit 94646190aa
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmdparse.l
View File

@ -65,9 +65,8 @@ EOL (\r?\n)
cmdyycolumn = 1; cmdyycolumn = 1;
} }
<WANT_STRING>[^\n]+ { BEGIN(INITIAL); cmdyylval.string = sstrdup(yytext); return STR; }
<WANT_WS_STRING>[ \t]* { BEGIN(WANT_STRING); return WHITESPACE; } <WANT_WS_STRING>[ \t]* { BEGIN(WANT_STRING); return WHITESPACE; }
<WANT_QSTRING>\"[^\"]+\" { <WANT_STRING>\"[^\"]+\" {
BEGIN(INITIAL); BEGIN(INITIAL);
/* strip quotes */ /* strip quotes */
char *copy = sstrdup(yytext+1); char *copy = sstrdup(yytext+1);
@ -75,6 +74,7 @@ EOL (\r?\n)
cmdyylval.string = copy; cmdyylval.string = copy;
return STR; return STR;
} }
<WANT_STRING>[^;\n]+ { BEGIN(INITIAL); cmdyylval.string = sstrdup(yytext); return STR; }
[ \t]* { return WHITESPACE; } [ \t]* { return WHITESPACE; }
attach { return TOK_ATTACH; } attach { return TOK_ATTACH; }

21
testcases/t/20-multiple-cmds.t
View File

@ -30,6 +30,27 @@ multiple_cmds("kill\t ;\tkill");
multiple_cmds("kill\t ;\t kill"); multiple_cmds("kill\t ;\t kill");
multiple_cmds("kill \t ; \t kill"); multiple_cmds("kill \t ; \t kill");
#####################################################################
# test if un-quoted strings are handled correctly
#####################################################################
$tmp = fresh_workspace;
cmd 'open';
my $unused = get_unused_workspace;
ok(!($unused ~~ @{get_workspace_names()}), 'workspace does not exist yet');
cmd "move workspace $unused; nop parser test";
ok(($unused ~~ @{get_workspace_names()}), 'workspace exists after moving');
#####################################################################
# quote the workspace name and use a ; (command separator) in its name
#####################################################################
$unused = get_unused_workspace;
$unused .= ';a';
ok(!($unused ~~ @{get_workspace_names()}), 'workspace does not exist yet');
cmd qq|move workspace "$unused"; nop parser test|;
ok(($unused ~~ @{get_workspace_names()}), 'workspace exists after moving');
# TODO: need a non-invasive command before implementing a test which uses ',' # TODO: need a non-invasive command before implementing a test which uses ','
done_testing; done_testing;