setxkbmap: Changes to 'master'

[Alan Coopersmith]

 setxkbmap.c |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit edb6fd1726146a85f166ffa34e361d88e8d386e8
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Feb 10 23:20:32 2011 -0800

    assigned value never used: "next" set at setxkbmap.c(654)
    
    If we go through the loop, next is overwritten on the very first line.
    If we don't go through the loop, next is never referenced again.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Dirk Wallenstein <halsmit at t-online.de>

commit ae3cfee9bd393d28159072a67360de57e64f48cd
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Feb 10 22:53:46 2011 -0800

    Use snprintf instead of trying to pre-measure sprintf result sizes.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Dirk Wallenstein <halsmit at t-online.de>

commit fce78beab4b5f7ee99bf66d35c36b7ed12871d5a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Feb 10 22:44:43 2011 -0800

    Bug 34151: Potential bug and buffer overflow due to misused rules filename
    
    https://bugs.freedesktop.org/show_bug.cgi?id=34151
    
    Use rfName consistently, instead of sometimes reverting to svValue[RULES_NDX]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Dirk Wallenstein <halsmit at t-online.de>

commit 2011f509c56b73cc62105c689d702f279f522017
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Feb 9 23:42:44 2011 -0800

    Bug 34117: setxkbmap -I dir not accepted, despite man page
    
    Easy enough to accept the syntax documented in the man page, so accept
    the -I flag with or without a space between -I and the directory argument.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=34117
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Dirk Wallenstein <halsmit at t-online.de>
    Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>