move trailing space stripping to client/proxmark3.c (per discussion on r426)

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 1afeb930742a0eb88f34a3f1379d7ed614a19fb9..6f17e0bdbe7c00cacd046131eba8073f9342159a 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -26,7 +26,7 @@ void CmdsHelp(const command_t Commands[])
   }
 }
 
   }
 }
 

-void CmdsParse(const command_t Commands[], char *Cmd)
+void CmdsParse(const command_t Commands[], const char *Cmd)

 {
   char cmd_name[32];
   int len = 0;
 {
   char cmd_name[32];
   int len = 0;


@@ -53,8 +53,6 @@ void CmdsParse(const command_t Commands[], char *Cmd)
   if (Commands[i].Name) {
     while (Cmd[len] == ' ')
       ++len;
   if (Commands[i].Name) {
     while (Cmd[len] == ' ')
       ++len;

-    while (Cmd[strlen(Cmd) - 1] == ' ')
-      Cmd[strlen(Cmd) - 1] = '\0';

     Commands[i].Parse(Cmd + len);
   } else {
     // show help for selected hierarchy or if command not recognised
     Commands[i].Parse(Cmd + len);
   } else {
     // show help for selected hierarchy or if command not recognised

diff --git a/client/cmdparser.h b/client/cmdparser.h
index 1002df8b57519e4b1578ed919570bd882bf9decf..28c2e66ef6390c840c342a6c45975dbde1b49fc5 100644 (file)
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -24,6 +24,6 @@ typedef struct command_s
 // Print help for each command in the command array
 void CmdsHelp(const command_t Commands[]);
 // Parse a command line
 // Print help for each command in the command array
 void CmdsHelp(const command_t Commands[]);
 // Parse a command line

-void CmdsParse(const command_t Commands[], char *Cmd);
+void CmdsParse(const command_t Commands[], const char *Cmd);

 
 #endif
 
 #endif

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 08a4e264f032467b54f0a6608a903c6a08e59944..17534558bbd9c17ee9a8390c568252ab84ac315e 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -65,6 +65,8 @@ static void *main_loop(void *targ)
     cmd = readline(PROXPROMPT);
     if (cmd) {
       if (cmd[0] != 0x00) {
     cmd = readline(PROXPROMPT);
     if (cmd) {
       if (cmd[0] != 0x00) {

+        while(cmd[strlen(cmd) - 1] == ' ')
+          cmd[strlen(cmd) - 1]= 0x00;

         CommandReceived(cmd);
         add_history(cmd);
       }
         CommandReceived(cmd);
         add_history(cmd);
       }