MySmartUSB-MK3-Interface

commit 333394dd1ba87d2efcbb7b41e608d7ad5b118b26
parent 9edac9b7835ed7b1cd5f7d7f1c7eeb8c78df4768
Author: Dominik Schmidt <das1993@hotmail.com>
Date:   Thu, 13 Dec 2012 22:06:50 +0100

Print usage is now working

Diffstat:
src/cmd_dispatch.c
 | 
2
+-
src/engine.c
 | 
6
++----
src/log.c
 | 
2
+-

3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/cmd_dispatch.c b/src/cmd_dispatch.c
@@ -23,7 +23,7 @@ struct command_def commands[]={
 	{.name="Boardreset", .opt={.arg_length=0, .short_option="-r", .long_option="--board-reset"}, .request_mymode=0, .callback=&cmd_board_reset},
 	{.name="Resetline", .opt={.usage="[1/0]", .arg_length=1, .short_option="-rL", .long_option="--reset-line"}, .request_mymode=1, .callback=&cmd_reset_line},
 	{.name="Boardpower", .opt={.usage="[1/0]", .arg_length=1, .short_option="-bP", .long_option="--board-power"}, .request_mymode=0, .callback=&cmd_board_power},
-	{.name="Set Emulation Mode", .opt={.usage="[UART,STK500,AVR910,Quiet,MyMode,ProgMode]", .arg_length=1, .short_option="-sE", .long_option="--set-emulation"}, .request_mymode=0, .callback=&cmd_set_emul_mode},
+	{.name="Set Emulation Mode", .opt={.usage="[d/UART,s/STK500,a/AVR910,q/Quiet,m/MyMode,p/ProgMode]", .arg_length=1, .short_option="-sE", .long_option="--set-emulation"}, .request_mymode=0, .callback=&cmd_set_emul_mode},
 	{.name="Rescue Clock", .opt={.usage="[1,0]", .arg_length=1, .short_option="-rC", .long_option="--rescue-clock"}, .request_mymode=0, .callback=&cmd_set_emul_mode},
 	{.name=NULL}
 };
diff --git a/src/engine.c b/src/engine.c
@@ -14,12 +14,11 @@
 #include <log.h>
 
 void print_usage(FILE *stream){
-	if(configuration.print_usage){
 		fprintf(stream,"Usage of %s\n",configuration.filename);
 		fprintf(stream,"Global Commands:\n");
 		fprintf(stream,"MySmartUSB Commands:\n");
 		struct command_def *cmdptr=commands;
-		while(cmdptr!=NULL){
+		while(cmdptr->name!=NULL){
 			if(cmdptr->opt.usage==NULL){
 				fprintf(stream,"\t%s: %s/%s\n", cmdptr->name, cmdptr->opt.short_option, cmdptr->opt.long_option);
 			}
@@ -33,7 +32,6 @@ void print_usage(FILE *stream){
 		}
 		
 		
-	}
 }
 
 int engine_init(int argc, char **argv){
@@ -59,7 +57,7 @@ int engine_run(void){
 }
 
 int engine_deinit(void){
-	if(configuration.print_usage||1){
+	if(configuration.print_usage){
 		print_usage(stderr);
 	}
 	return 0;
diff --git a/src/log.c b/src/log.c
@@ -47,7 +47,7 @@ void log_string(char *str, unsigned short int level){
 		}
 	}
 	if(configuration.log_level<=level){
-		fprintf(stream,"%s%s\n%s",color, str, reset_color);
+		fprintf(stream,"%s%s%s\n",color, str, reset_color);
 	}
 }
 void do_log(char *src, char *msg, unsigned short int level, unsigned short int type){