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

parser: corrected xf86getBoolValue to use case insensitive compare 

commit c6e8637e29 introduced this
regression; it can cause existing config files to be parsed incorrectly.

Acked-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Oliver McFadden 2010-02-03 10:05:20 +02:00 committed by Keith Packard
parent be96fb2f02
commit 031f92bf9a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/parser/scan.c
View File

@ -1207,21 +1207,21 @@ xf86getBoolValue(Bool *val, const char *str)
if (*str == '\0') { if (*str == '\0') {
*val = TRUE; *val = TRUE;
} else { } else {
if (strcmp(str, "1") == 0) if (xf86nameCompare(str, "1") == 0)
*val = TRUE; *val = TRUE;
else if (strcmp(str, "on") == 0) else if (xf86nameCompare(str, "on") == 0)
*val = TRUE; *val = TRUE;
else if (strcmp(str, "true") == 0) else if (xf86nameCompare(str, "true") == 0)
*val = TRUE; *val = TRUE;
else if (strcmp(str, "yes") == 0) else if (xf86nameCompare(str, "yes") == 0)
*val = TRUE; *val = TRUE;
else if (strcmp(str, "0") == 0) else if (xf86nameCompare(str, "0") == 0)
*val = FALSE; *val = FALSE;
else if (strcmp(str, "off") == 0) else if (xf86nameCompare(str, "off") == 0)
*val = FALSE; *val = FALSE;
else if (strcmp(str, "false") == 0) else if (xf86nameCompare(str, "false") == 0)
*val = FALSE; *val = FALSE;
else if (strcmp(str, "no") == 0) else if (xf86nameCompare(str, "no") == 0)
*val = FALSE; *val = FALSE;
else else
return FALSE; return FALSE;