Fix compile errors with MacOS (#312)

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 7bba80f4cbe784967689f6e06858ee3f3d5d36fe..f407cee4bf601e883206bfbaf4bbe453d8153306 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -12,7 +12,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>

-#include "sleep.h"

 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "data.h"
 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "data.h"


@@ -24,13 +23,16 @@
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"

+#include "util_posix.h"

 #include "cmdscript.h"
 #include "cmdscript.h"

+#include "cmdcrc.h"

 
 
 unsigned int current_command = CMD_UNKNOWN;
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 
 
 unsigned int current_command = CMD_UNKNOWN;
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);

+static int CmdRev(const char *Cmd);

 
 //For storing command that are received from the device
 #define CMD_BUFFER_SIZE 50
 
 //For storing command that are received from the device
 #define CMD_BUFFER_SIZE 50


@@ -42,15 +44,16 @@ static int cmd_tail;//Starts as 0
 
 static command_t CommandTable[] = 
 {
 
 static command_t CommandTable[] = 
 {

-       {"help",        CmdHelp,        1, "This help. Use '<command> help' for details of a particular command."},
-       {"data",        CmdData,        1, "{ Plot window / data buffer manipulation... }"},
-       {"hf",          CmdHF,          1, "{ High Frequency commands... }"},
-       {"hw",          CmdHW,          1, "{ Hardware commands... }"},
-       {"lf",          CmdLF,          1, "{ Low Frequency commands... }"},
-       {"script",      CmdScript,      1, "{ Scripting commands }"},
-       {"quit",        CmdQuit,        1, "Exit program"},
-       {"exit",        CmdQuit,        1, "Exit program"},
-       {NULL, NULL, 0, NULL}
+  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of a particular command."},
+  {"data",  CmdData,  1, "{ Plot window / data buffer manipulation... }"},
+  {"hf",    CmdHF,    1, "{ High Frequency commands... }"},
+  {"hw",    CmdHW,    1, "{ Hardware commands... }"},
+  {"lf",    CmdLF,    1, "{ Low Frequency commands... }"},
+  {"reveng",CmdRev,   1, "Crc calculations from the software reveng1-30"},
+  {"script",CmdScript,1, "{ Scripting commands }"},
+  {"quit",  CmdQuit,  1, "Exit program"},
+  {"exit",  CmdQuit,  1, "Exit program"},
+  {NULL, NULL, 0, NULL}

 };
 
 command_t* getTopLevelCommandTable()
 };
 
 command_t* getTopLevelCommandTable()


@@ -67,6 +70,13 @@ int CmdQuit(const char *Cmd)
 {
   return 99;
 }
 {
   return 99;
 }

+
+int CmdRev(const char *Cmd)
+{
+  CmdCrc(Cmd);
+  return 0;
+}
+

 /**
  * @brief This method should be called when sending a new command to the pm3. In case any old
  *  responses from previous commands are stored in the buffer, a call to this method should clear them.
 /**
  * @brief This method should be called when sending a new command to the pm3. In case any old
  *  responses from previous commands are stored in the buffer, a call to this method should clear them.


@@ -177,10 +187,11 @@ void UsbCommandReceived(UsbCommand *UC)
        switch(UC->cmd) {
                // First check if we are handling a debug message
                case CMD_DEBUG_PRINT_STRING: {
        switch(UC->cmd) {
                // First check if we are handling a debug message
                case CMD_DEBUG_PRINT_STRING: {

-                       char s[USB_CMD_DATA_SIZE+1] = {0x00};
+                       char s[USB_CMD_DATA_SIZE+1];
+                       memset(s, 0x00, sizeof(s));

                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
                        memcpy(s,UC->d.asBytes,len);
                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
                        memcpy(s,UC->d.asBytes,len);

-                       PrintAndLog("#db# %s       ", s);
+                       PrintAndLog("#db# %s", s);

                        return;
                } break;
 
                        return;
                } break;