summary refs log tree commit diff
path: root/parse.y
diff options
context:
space:
mode:
authorokan <okan>2014-01-21 15:42:44 +0000
committerokan <okan>2014-01-21 15:42:44 +0000
commit371902b3c9fc6c7419f8134e96d67c8735726ff2 (patch)
tree4963c37a48000819c291dabede7d429572398352 /parse.y
parent86b149ad2537061b8af6a51376835c1e1f1cc4ec (diff)
parentac3162439ad826026b499363b445e8c533313ff2 (diff)
downloadcwm-371902b3c9fc6c7419f8134e96d67c8735726ff2.tar.gz
cwm-371902b3c9fc6c7419f8134e96d67c8735726ff2.tar.xz
cwm-371902b3c9fc6c7419f8134e96d67c8735726ff2.zip
cvsimport
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y9
1 files changed, 7 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index c7a802a..188c090 100644
--- a/parse.y
+++ b/parse.y
@@ -139,7 +139,7 @@ main		: FONTNAME STRING		{
 			conf->snapdist = $2;
 		}
 		| COMMAND STRING string		{
-			conf_cmd_add(conf, $3, $2);
+			conf_cmd_add(conf, $2, $3);
 			free($2);
 			free($3);
 		}
@@ -157,7 +157,12 @@ main		: FONTNAME STRING		{
 			free($2);
 		}
 		| BIND STRING string		{
-			conf_bind_kbd(conf, $2, $3);
+			if (!conf_bind_kbd(conf, $2, $3)) {
+				yyerror("invalid bind: %s %s", $2, $3);
+				free($2);
+				free($3);
+				YYERROR;
+			}
 			free($2);
 			free($3);
 		}