diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2006-01-09 19:54:28 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2006-01-09 19:54:28 +0000 |
| commit | 61927b82992f03dcd87ff7d1733c7e572546bc97 (patch) | |
| tree | 9ebdee9f05ea257b9825b1707e2dc97997e719cf /usr.sbin/kbdmap/kbdmap.c | |
| parent | 6c62b2acd07bf6e6011a4fd5a563fc030d71f500 (diff) | |
| download | src-61927b82992f03dcd87ff7d1733c7e572546bc97.tar.gz src-61927b82992f03dcd87ff7d1733c7e572546bc97.zip | |
Fix -r causing SIGSEGV due to parse_args() being called before font_current is set.
Approved by: krion
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=154151
Diffstat (limited to 'usr.sbin/kbdmap/kbdmap.c')
| -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 b99b057c9a11..6958f6140327 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(); |