xserver: Branch 'master'

[Tiago Vignatti]

 hw/kdrive/src/kinput.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

New commits:
diff-tree 600ef07113caa7a901c7d486bc8ebd1ae47f885c (from f3955c0a020b39021050cd33c20a17f14fc4b579)
Author: Tiago Vignatti <tiagov at balalaika.(none)>
Date:   Fri Aug 3 15:33:41 2007 -0300

    Fix kdrive command line parser.

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index cfd162f..8018bef 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1233,14 +1233,17 @@ KdParsePointer (char *arg)
             bzero(newopt, sizeof (InputOption));
 
             for (tmpo = &options; *tmpo; tmpo = &(*tmpo)->next)
+                ; /* Hello, I'm here */
+
             *tmpo = newopt;
 
-            if (strchr(arg, '='))
+            if (strchr(save, '='))
             {
-                i = (strchr(arg, '=') - arg);
-                newopt->key = (char *)xalloc(i+1);
-                strncpy(newopt->key, arg, i+1);
-                newopt->value = xstrdup(strchr(arg, '=') + 1);
+                i = (strchr(save, '=') - save);
+                newopt->key = (char *)xalloc(i);
+                strncpy(newopt->key, save, i);
+		newopt->key[i] = '\0';
+                newopt->value = xstrdup(strchr(save, '=') + 1);
             }
             else
             {