diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2005-07-11 13:55:14 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2005-07-11 13:55:14 +0000 |
| commit | 2f745c154065dfeae33c864b4e61cfca7a3d4974 (patch) | |
| tree | 16e9523fb35e586e13ef6786bf14ee6610ddf8b7 /libcons | |
| parent | ddeb9733fb4eccc2dc8bd36633db7b34a7ba3627 (diff) | |
2005-03-05 Samuel Thibault <samuel.thibault@ens-lyon.org>
* priv.h (_cons_file): Prototype moved and renamed to...
* cons.h (cons_file): ... this.
* init-init.c (cons_init): Updated `_cons_file' reference.
* opts-std-startup.c (_cons_file): Renamed into `cons_file'. Updated
reference.
Diffstat (limited to 'libcons')
| -rw-r--r-- | libcons/ChangeLog | 8 | ||||
| -rw-r--r-- | libcons/cons.h | 3 | ||||
| -rw-r--r-- | libcons/init-init.c | 2 | ||||
| -rw-r--r-- | libcons/opts-std-startup.c | 4 | ||||
| -rw-r--r-- | libcons/priv.h | 3 |
5 files changed, 14 insertions, 6 deletions
diff --git a/libcons/ChangeLog b/libcons/ChangeLog index 7e33f39a..af2bd34a 100644 --- a/libcons/ChangeLog +++ b/libcons/ChangeLog @@ -1,3 +1,11 @@ +2005-03-05 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * priv.h (_cons_file): Prototype moved and renamed to... + * cons.h (cons_file): ... this. + * init-init.c (cons_init): Updated `_cons_file' reference. + * opts-std-startup.c (_cons_file): Renamed into `cons_file'. Updated + reference. + 2005-01-06 Marco Gerards <metgerards@student.han.nl> * Makefile (SRCS): Add `vcons-move-mouse.c' and `vcons-event.c'. diff --git a/libcons/cons.h b/libcons/cons.h index 9915dc3b..e9d01a8c 100644 --- a/libcons/cons.h +++ b/libcons/cons.h @@ -298,6 +298,9 @@ extern const struct argp cons_startup_argp; extern struct port_bucket *cons_port_bucket; extern struct port_class *cons_port_class; +/* The filename of the console server. */ +extern char *cons_file; + error_t cons_init (void); void cons_server_loop (void); int cons_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp); diff --git a/libcons/init-init.c b/libcons/init-init.c index 731d819e..eda292f5 100644 --- a/libcons/init-init.c +++ b/libcons/init-init.c @@ -56,7 +56,7 @@ cons_init (void) mutex_init (&cons->lock); cons->vcons_list = NULL; cons->vcons_last = NULL; - cons->dir = opendir (_cons_file); + cons->dir = opendir (cons_file); cons->slack = _cons_slack; if (!cons->dir) { diff --git a/libcons/opts-std-startup.c b/libcons/opts-std-startup.c index 3cf81ae7..23bd9971 100644 --- a/libcons/opts-std-startup.c +++ b/libcons/opts-std-startup.c @@ -58,7 +58,7 @@ int _cons_jump_down_on_input = 1; int _cons_jump_down_on_output; /* The filename of the console server. */ -char *_cons_file; +char *cons_file; /* The type of bell used for the visual bell. */ bell_type_t _cons_visual_bell = BELL_VISUAL; @@ -206,7 +206,7 @@ parse_startup_opt (int opt, char *arg, struct argp_state *state) if (state->arg_num > 0) /* Too many arguments. */ argp_error (state, "Too many non option arguments"); - _cons_file = arg; + cons_file = arg; break; case ARGP_KEY_NO_ARGS: diff --git a/libcons/priv.h b/libcons/priv.h index 377f021c..38971ff8 100644 --- a/libcons/priv.h +++ b/libcons/priv.h @@ -45,9 +45,6 @@ extern int _cons_jump_down_on_input; /* If we jump down at output. */ extern int _cons_jump_down_on_output; -/* The filename of the console server. */ -extern char *_cons_file; - /* The type of bell used for the visual bell. */ extern bell_type_t _cons_visual_bell; |