xkbcomp: Changes to 'master'

[Peter Hutterer]

 xkbcomp.c |    4 ++--
 xkbscan.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 0ebdf47fd4bc434ac3d2339544c022a869510738
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 11 13:53:31 2013 +1000

    Parse -w1 flag correctly (#66344)
    
    if the flag is "-w", then argv[i][1] is 'w' and unlikely to be a digit.
    Access [2] instead, which is either \0 or an actual digit.
    
    X.Org Bug 66344 <http://bugs.freedesktop.org/show_bug.cgi?id=66344>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Matt Dew <marcoz at osource.org>

commit cdcd552041fc1325a2a81e3374fadb0dd15950dc
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 11 13:26:18 2013 +1000

    Always terminate the scanBuf string (#66345)
    
    If a key name exceeds 4 characters, the content of scanBuf is not
    null-terminated, giving error messages like
    
    syntax error: line 7 of test.xkb
    last scanned symbol is: FOOBARm
    Errors encountered in test.xkb; not compiled.
    
    (last character of the preceding 'maximum' statement in this case)
    
    X.Org Bug 66345 <http://bugs.freedesktop.org/show_bug.cgi?id=66345>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>