- remove requirement for file2c.tcl

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1dfe5515ceb577580d3fa88739e192c145ea7849..dcaca7847abee926d841dfcb3cc4c2969438500e 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -697,12 +697,28 @@ static char* openocd_jim_fgets(char *s, int size, void *cookie)
 void add_jim(const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj *const *argv), const char *help)
 {
        Jim_CreateCommand(interp, name, cmd, NULL, NULL);
-       /* FIX!!! add scheme to accumulate help! */
        
+       /* FIX!!! it would be prettier to invoke add_help_text... 
+       accumulate help text in Tcl helptext list.  */
+    Jim_Obj *helptext=Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);
+       Jim_Obj *cmd_entry=Jim_NewListObj(interp, NULL, 0);
+       
+       Jim_Obj *cmd_list=Jim_NewListObj(interp, NULL, 0);
+       Jim_ListAppendElement(interp, cmd_list, Jim_NewStringObj(interp, name, -1));
+       
+       Jim_ListAppendElement(interp, cmd_entry, cmd_list);
+       Jim_ListAppendElement(interp, cmd_entry, Jim_NewStringObj(interp, help, -1));
+       Jim_ListAppendElement(interp, helptext, cmd_entry);
 }
 
+extern char binary_startup_tcl_start;
+extern char binary_startup_tcl_size;
+
 void initJim(void)
 {
+       char *script;
+       int script_len;
+       
        Jim_CreateCommand(interp, "openocd", Jim_Command_openocd, NULL, NULL);
        Jim_CreateCommand(interp, "openocd_throw", Jim_Command_openocd_throw, NULL, NULL);
        Jim_CreateCommand(interp, "find", Jim_Command_find, NULL, NULL);
@@ -719,29 +735,30 @@ void initJim(void)
        interp->cb_vfprintf = openocd_jim_vfprintf;
        interp->cb_fflush = openocd_jim_fflush;
        interp->cb_fgets = openocd_jim_fgets;
-}
-
-extern const unsigned char filedata_startup[];
-
-/* after command line parsing */
-void initJim2(void)
-{
-       if (Jim_Eval(interp, filedata_startup)==JIM_ERR)
+       
+       add_default_dirs();
+       
+       script_len = (int)&binary_startup_tcl_size;
+       script = malloc(script_len + sizeof(char));
+       memcpy(script, &binary_startup_tcl_start, script_len);
+       
+       /* null terminate */
+       script[script_len] = 0;
+       
+       if (Jim_Eval(interp, script)==JIM_ERR)
        {
                LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD compile time)");
                Jim_PrintErrorMessage(interp);
                exit(-1);
        }
+       
+       free(script);
 }
 
-
 int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       FILE *script_file;
-
        if (argc != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-
        
        /* Run a tcl script file */
        return command_run_linef(cmd_ctx, "source [find {%s}]", args[0]);
@@ -752,7 +769,7 @@ command_context_t *setup_command_handler(void)
        command_context_t *cmd_ctx;
        
        cmd_ctx = command_init();
-
+       
        register_command(cmd_ctx, NULL, "version", handle_version_command,
                                         COMMAND_EXEC, "show OpenOCD version");
        register_command(cmd_ctx, NULL, "daemon_startup", handle_daemon_startup_command, COMMAND_CONFIG, 
@@ -825,10 +842,7 @@ int openocd_main(int argc, char *argv[])
        
        active_cmd_ctx=cfg_cmd_ctx;
        
-       add_default_dirs();
 
-       initJim2();
-       
        if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;