koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: Correctly handle --no-startup-id with quoted exec commands (Thanks aksr)

Browse Source 
Parser changes shortly before a release. What could possibly go wrong.
This commit is contained in:
Michael Stapelberg
2011-11-11 00:28:04 +00:00
parent 41cf2468c0
commit 60bfc3a600
5 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cmdparse.y
View File

@ -174,6 +174,7 @@ bool definitelyGreaterThan(float a, float b, float epsilon) {
%token TOK_PPT "ppt"
%token TOK_NOP "nop"
%token TOK_BACK_AND_FORTH "back_and_forth"
%token TOK_NO_STARTUP_ID "--no-startup-id"
%token TOK_CLASS "class"
%token TOK_INSTANCE "instance"
@ -197,6 +198,7 @@ bool definitelyGreaterThan(float a, float b, float epsilon) {
%type <number> resize_way
%type <number> resize_tiling
%type <number> optional_kill_mode
%type <number> optional_no_startup_id
%%
@ -387,21 +389,22 @@ operation:
;
exec:
TOK_EXEC STR
TOK_EXEC optional_no_startup_id STR
{
char *command = $2;
bool no_startup_id = false;
if (strncasecmp($2, "--no-startup-id ", strlen("--no-startup-id ")) == 0) {
no_startup_id = true;
command += strlen("--no-startup-id ");
}
char *command = $3;
bool no_startup_id = $2;
printf("should execute %s, no_startup_id = %d\n", command, no_startup_id);
start_application(command, no_startup_id);
free($2);
free($3);
}
;
optional_no_startup_id:
/* empty */ { $$ = false; }
| TOK_NO_STARTUP_ID { $$ = true; }
;
exit:
TOK_EXIT
{