hal: Branch 'master'

[David Zeuthen]

 tools/hal-setup-keymap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree a268049eb5caabbe97f6f8d34e8a095b00e340f4 (from 94b60f1a712a84649f2890bcd4060a73d29cb195)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Oct 10 15:28:17 2007 -0400

    fix segfault when setting up keymap

diff --git a/tools/hal-setup-keymap.c b/tools/hal-setup-keymap.c
index 98d5408..4ae82f5 100644
--- a/tools/hal-setup-keymap.c
+++ b/tools/hal-setup-keymap.c
@@ -152,7 +152,7 @@ main (int argc, char **argv)
 		} else {
 			fprintf (stderr, "hal-setup-keymap: Failed to parse %s\n", keymap_list[i]);
 		}
-	} while (keymap_list[i++] != NULL);
+	} while (keymap_list[++i] != NULL);
 
 	libhal_free_string_array (keymap_list);
 	close (fd);