summaryrefslogtreecommitdiff
path: root/src/helper/command.c
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-27 19:14:30 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-28 13:00:38 -0800
commitdf22f0f9ca4ebf881adf8d20cb63e64139f18613 (patch)
treed19f7e4bfe99241d00925396b79e4699cc433f7a /src/helper/command.c
parent37dd5a685a67f9069ac0c1d98d47077a67fb897a (diff)
downloadopenocd+libswd-df22f0f9ca4ebf881adf8d20cb63e64139f18613.tar.gz
openocd+libswd-df22f0f9ca4ebf881adf8d20cb63e64139f18613.tar.bz2
openocd+libswd-df22f0f9ca4ebf881adf8d20cb63e64139f18613.tar.xz
openocd+libswd-df22f0f9ca4ebf881adf8d20cb63e64139f18613.zip
improve command handler wrapper script
Adds 'ocd_bouncer' in startup.tcl that is called as a helper for all command handlers, shrinking the embedded C wrapper to a mere stub. Jim handlers are called directly, simple handlers get called with the wrapper to capture and discard their output on error, and placeholders call help directly (though the unknown handler still does this too). It attempts to improve the quality of the error messages as well.
Diffstat (limited to 'src/helper/command.c')
-rw-r--r--src/helper/command.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index 23175baf..ba041571 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -314,9 +314,8 @@ static int register_command_handler(struct command *c)
}
/* we now need to add an overrideable proc */
- const char *override_name = alloc_printf("proc %s {args} {"
- "if {[catch {eval ocd_%s $args}] == 0} "
- "{return \"\"} else {return -code error}}",
+ const char *override_name = alloc_printf(
+ "proc %s {args} {eval ocd_bouncer %s $args}",
full_name, full_name);
if (NULL == override_name)
goto free_full_name;