From 5e229bbf87fbb5a809553526edf0186dd3dd5cf8 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Tue, 17 Nov 2009 09:15:09 -0800 Subject: pass startup_tcl to command_init Removes external linkage from helper module, making the startup code a parameter to a new command context's initialization routine. --- src/helper/command.c | 3 +-- src/helper/command.h | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/helper') diff --git a/src/helper/command.c b/src/helper/command.c index ad09e3de..708a8024 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -766,10 +766,9 @@ COMMAND_HANDLER(handle_fast_command) } -struct command_context* command_init() +struct command_context* command_init(const char *startup_tcl) { struct command_context* context = malloc(sizeof(struct command_context)); - extern const char startup_tcl[]; const char *HostOs; context->mode = COMMAND_EXEC; diff --git a/src/helper/command.h b/src/helper/command.h index 62231fc8..05088b56 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -190,7 +190,10 @@ struct command_context* copy_command_context(struct command_context* context); int command_context_mode(struct command_context *context, enum command_mode mode); -struct command_context* command_init(void); +/** + * Creates a new command context using the startup TCL provided. + */ +struct command_context* command_init(const char *startup_tcl); int command_done(struct command_context *context); void command_print(struct command_context *context, const char *format, ...) -- cgit v1.2.3