diff options
| author | flz <flz@FreeBSD.org> | 2006-01-09 19:54:28 +0000 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2006-01-09 19:54:28 +0000 |
| commit | 4d88aab3ea1d28d6617480348f596c37389d6434 (patch) | |
| tree | 9ebdee9f05ea257b9825b1707e2dc97997e719cf /usr.sbin/kbdmap | |
| parent | cecb9f6b7be918ffcd172fb9edabcef2556d94ad (diff) | |
| download | FreeBSD-src-4d88aab3ea1d28d6617480348f596c37389d6434.zip FreeBSD-src-4d88aab3ea1d28d6617480348f596c37389d6434.tar.gz | |
Fix -r causing SIGSEGV due to parse_args() being called before font_current is set.
Approved by: krion
MFC after: 3 days
Diffstat (limited to 'usr.sbin/kbdmap')
| -rw-r--r-- | usr.sbin/kbdmap/kbdmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index b99b057..6958f61 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -823,9 +823,6 @@ main(int argc, char **argv) program = extract_name(argv[0]); - /* Parse command line arguments */ - parse_args(argc, argv); - font_current = get_font(); if (font_current == NULL) font_current = font_default; @@ -835,6 +832,9 @@ main(int argc, char **argv) else dir = keymapdir; + /* Parse command line arguments */ + parse_args(argc, argv); + /* Read and display options */ menu_read(); |
