frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: fix check for appending '|' character when applying rules 

There are two ways to separate multiple files in XKB include statements:
'+' will cause the later file to override the first in case of conflict,
while '|' will cause it augment it (this is done by xkbcomp). '!' is
unrelated here.
Currently, if someone tries to use '|' in a rule instead of '+', it
won't have any effect. Since '|' is practically never used, this wasn't
noticed.

Signed-off-by: Ran Benita <ran234@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Ran Benita 2012-08-29 12:33:34 +03:00 committed by Peter Hutterer
parent 392da389d7
commit 527c6baa29
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xkb/maprules.c
View File

@ -578,7 +578,7 @@ static void
Apply(const char *src, char **dst) Apply(const char *src, char **dst)
{ {
if (src) { if (src) {
if (*src == '+' || *src == '!') { if (*src == '+' || *src == '|') {
*dst = _Concat(*dst, src); *dst = _Concat(*dst, src);
} }
else { else {