Tidy up some more output. The command-line code needs some severe

overhauling, but this is not the time to do it.

diff --git a/src/commandline/commands/help.c b/src/commandline/commands/help.c
index 30ab962..6ba6175 100644 (file)
--- a/src/commandline/commands/help.c
+++ b/src/commandline/commands/help.c
@@ -13,19 +13,19 @@ static int cmd_help_exec ( int argc, char **argv ) {
        struct command *ccmd;
        int unknown = 1;
        if(argc == 1){
-               printf("Built in commands:\n\n\texit, quit\t\tExit the command line and boot\n\nCompiled in commands:\n\n");
+               printf("Available commands:\n\n  exit - Exit the command line and boot\n");
 
                for ( ccmd = cmd_start ; ccmd < cmd_end ; ccmd++ ) {
-                       printf ("\t%s\t\t%s\n", ccmd->name, ccmd->desc );
+                       printf ("  %s - %s\n", ccmd->name, ccmd->desc );
                }
        }else{
                if(!strcmp(argv[1], "exit") || !strcmp(argv[1], "quit")){
-                       printf("exit, quit - The quit command\n\nUsage:\nquit or exit\n\n\tExample:\n\t\texit\n");
+                       printf("exit - Exit the command line and boot\n\nUsage:\n  exit\n");
                }else{
                        for ( ccmd = cmd_start ; ccmd < cmd_end ; ccmd++ ) {
                                if(!strcmp(ccmd->name, argv[1])){
                                        unknown = 0;
-                                       printf ("\t%s - %s\n\nUsage:\n%s\n", ccmd->name, ccmd->desc, ccmd->usage );
+                                       printf ("%s - %s\n\nUsage:\n  %s\n", ccmd->name, ccmd->desc, ccmd->usage );
                                        break;
                                }
                        }
@@ -40,7 +40,7 @@ static int cmd_help_exec ( int argc, char **argv ) {
 
 struct command help_command __command = {
        .name = "help",
-       .usage = "help <command>\n\n\tExample:\n\t\thelp help\n",
+       .usage = "help <command>\n\nExample:\n  help help\n",
        .desc = "The help command",
        .exec = cmd_help_exec,
 };

diff --git a/src/commandline/commands/nvo_cmd.c b/src/commandline/commands/nvo_cmd.c
index ea1478f..662ad7b 100644 (file)
--- a/src/commandline/commands/nvo_cmd.c
+++ b/src/commandline/commands/nvo_cmd.c
@@ -41,7 +41,7 @@ static int show_exec ( int argc, char **argv ) {
 
 struct command show_command __command = {
        .name = "show",
-       .usage = "show\n",
+       .usage = "show <identifier>\n",
        .desc = "Show stored options",
        .exec = show_exec,
 };
@@ -78,7 +78,7 @@ static int set_exec ( int argc, char **argv ) {
 
 struct command set_command __command = {
        .name = "set",
-       .usage = "set <option number> <option string>\n",
+       .usage = "set <identifier> <value>\n",
        .desc = "Set stored option",
        .exec = set_exec,
 };