Refactoring uart interface (#341)

[proxmark3-svn] / client / cmdcrc.c

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 006804eebd710b42d381550a719a39b2ea8c64c1..01f65f553930c2a0a5859c69e6fadfd627ea7a3f 100644 (file)
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -8,7 +8,6 @@
 // CRC Calculations from the software reveng commands
 //-----------------------------------------------------------------------------
 
 // CRC Calculations from the software reveng commands
 //-----------------------------------------------------------------------------
 

-#include <stdlib.h>

 #ifdef _WIN32
 #  include <io.h>
 #  include <fcntl.h>
 #ifdef _WIN32
 #  include <io.h>
 #  include <fcntl.h>


@@ -19,8 +18,8 @@
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

-//#include <stdlib.h>
-//#include <ctype.h>
+#include <stdlib.h>
+#include <ctype.h>

 #include "cmdmain.h"
 #include "cmdcrc.h"
 #include "reveng/reveng.h"
 #include "cmdmain.h"
 #include "cmdcrc.h"
 #include "reveng/reveng.h"


@@ -44,9 +43,10 @@ int split(char *str, char *arr[MAX_ARGS]){
                while(isspace(str[beginIndex])){
                        ++beginIndex;
                }
                while(isspace(str[beginIndex])){
                        ++beginIndex;
                }

-               if(str[beginIndex] == '\0')
+               if(str[beginIndex] == '\0') {

                        break;
                        break;

-                       endIndex = beginIndex;
+               }
+               endIndex = beginIndex;

                while (str[endIndex] && !isspace(str[endIndex])){
                        ++endIndex;
                }
                while (str[endIndex] && !isspace(str[endIndex])){
                        ++endIndex;
                }


@@ -311,7 +311,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
        int ibperhx = 8, obperhx = 8;
        int rflags = 0; // search flags 
        int c;
        int ibperhx = 8, obperhx = 8;
        int rflags = 0; // search flags 
        int c;

-       unsigned long width = 0UL;
+       //unsigned long width;

        poly_t apoly, crc;
 
        char *string;
        poly_t apoly, crc;
 
        char *string;


@@ -331,7 +331,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
                return uerr("no preset models available");
 
        // must set width so that parameter to -ipx is not zeroed 
                return uerr("no preset models available");
 
        // must set width so that parameter to -ipx is not zeroed 

-       width = plen(model.spoly);
+       //width = plen(model.spoly);

        rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
        
        //set flags
        rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
        
        //set flags


@@ -501,14 +501,14 @@ int CmdrevengSearch(const char *Cmd){
                if (ans) {
                        //test for match
                        if (memcmp(result, inCRC, crcChars)==0){
                if (ans) {
                        //test for match
                        if (memcmp(result, inCRC, crcChars)==0){

-                               PrintAndLog("\nFound a match!\nModel: %s\nValue: %s\n",Models[i], result);
+                               PrintAndLog("\nFound a possible match!\nModel: %s\nValue: %s\n",Models[i], result);

                                //optional - stop searching if found...
                                found = true;
                        } else {
                                if (crcChars > 2){
                                        char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
                                        if (memcmp(swapEndian, inCRC, crcChars)==0){
                                //optional - stop searching if found...
                                found = true;
                        } else {
                                if (crcChars > 2){
                                        char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
                                        if (memcmp(swapEndian, inCRC, crcChars)==0){

-                                               PrintAndLog("\nFound a match!\nModel: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);
+                                               PrintAndLog("\nFound a possible match!\nModel: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);

                                                //optional - stop searching if found...
                                                found = true;
                                        }
                                                //optional - stop searching if found...
                                                found = true;
                                        }


@@ -522,14 +522,14 @@ int CmdrevengSearch(const char *Cmd){
                        if (ans) {
                                //test for match
                                if (memcmp(revResult, inCRC, crcChars)==0){
                        if (ans) {
                                //test for match
                                if (memcmp(revResult, inCRC, crcChars)==0){

-                                       PrintAndLog("\nFound a match!\nModel Reversed: %s\nValue: %s\n",Models[i], revResult);
+                                       PrintAndLog("\nFound a possible match!\nModel Reversed: %s\nValue: %s\n",Models[i], revResult);

                                        //optional - stop searching if found...
                                        found = true;
                                } else {
                                        if (crcChars > 2){
                                                char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
                                                if (memcmp(swapEndian, inCRC, crcChars)==0){
                                        //optional - stop searching if found...
                                        found = true;
                                } else {
                                        if (crcChars > 2){
                                                char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
                                                if (memcmp(swapEndian, inCRC, crcChars)==0){

-                                                       PrintAndLog("\nFound a match!\nModel Reversed: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);
+                                                       PrintAndLog("\nFound a possible match!\nModel Reversed: %s\nValue EndianSwapped: %s\n",Models[i], swapEndian);

                                                        //optional - stop searching if found...
                                                        found = true;
                                                }
                                                        //optional - stop searching if found...
                                                        found = true;
                                                }