diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2004-03-21 19:57:00 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2004-03-21 19:57:00 +0000 |
| commit | 132c62de3caad3a9c7de679854f8eb214ad0ce8e (patch) | |
| tree | 476ea75710fcba20a624e2ce3b5bb1aace60f29b /console-client/console.c | |
| parent | f34ee975ad64f836b3e6af7303f79c6e8ff76a3d (diff) | |
2004-03-21 Marco Gerards <metgerards@student.han.nl>
* console.c (main): Make sure the arguments are parsed in order.
* driver.c (driver_add): Set up argc and argv so they can be used
by argp.
* generic-speaker.c: Include <string.h> and <argp.h>.
(struct melody): New member `name'. Every melody was given a
name.
(BELL_CLASSIC, BELL_LINUX, BELL_ALARM, BELL_CMAJOR): New macros.
(doc, options, argp): New variables.
(parse_opt): New function.
(generic_speaker_init): Parse the arguments using argp.
* vga.c (doc, options, argp): New variables.
(parse_opt): New function.
(parse_startup_args): Function removed.
(vga_display_init): Use argp_parse instead of parse_startup_args.
Diffstat (limited to 'console-client/console.c')
| -rw-r--r-- | console-client/console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/console-client/console.c b/console-client/console.c index 0fb3aa97..4bc9d6f4 100644 --- a/console-client/console.c +++ b/console-client/console.c @@ -1,5 +1,5 @@ /* console.c -- A pluggable console client. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. Written by Marcus Brinkmann. This program is free software; you can redistribute it and/or @@ -455,7 +455,7 @@ main (int argc, char *argv[]) driver_init (); /* Parse our command line. This shouldn't ever return an error. */ - argp_parse (&startup_argp, argc, argv, 0, 0, 0); + argp_parse (&startup_argp, argc, argv, ARGP_IN_ORDER, 0, 0); err = driver_start (&errname); if (err) |