FIX: sprint_bin_break didn't print the last digit in array.

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 0544d072049ce06a6911a2ed218a078e9b98ccf8..5d36547b87a5c5e4c010bb1fd6f78069e3f54dd0 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -195,8 +195,8 @@ static int CmdHelp(const char *Cmd);
 \r
 void printT5xxHeader(uint8_t page){\r
        PrintAndLog("Reading Page %d:", page);  \r
 \r
 void printT5xxHeader(uint8_t page){\r
        PrintAndLog("Reading Page %d:", page);  \r

-       PrintAndLog("blk | hex data | binary                          | ascii");\r
-       PrintAndLog("----+----------+---------------------------------+-------");       \r
+       PrintAndLog("blk | hex data | binary                           | ascii");\r
+       PrintAndLog("----+----------+----------------------------------+-------");      \r

 }\r
 \r
 int CmdT55xxSetConfig(const char *Cmd) {\r
 }\r
 \r
 int CmdT55xxSetConfig(const char *Cmd) {\r


@@ -907,8 +907,8 @@ int special(const char *Cmd) {
        uint32_t blockData = 0;\r
        uint8_t bits[32] = {0x00};\r
 \r
        uint32_t blockData = 0;\r
        uint8_t bits[32] = {0x00};\r
 \r

-       PrintAndLog("OFFSET | DATA  | BINARY                             | ASCII");\r
-       PrintAndLog("-------+-------+------------------------------------+------");\r
+       PrintAndLog("OFFSET | DATA  | BINARY                              | ASCII");\r
+       PrintAndLog("-------+-------+-------------------------------------+------");\r

        int i,j = 0;\r
        for (; j < 64; ++j){\r
                \r
        int i,j = 0;\r
        for (; j < 64; ++j){\r
                \r

diff --git a/client/util.c b/client/util.c
index 76c8d6d86c82a39b1c697a2e2b015a9db800e57b..a3590a397f1f3f7eac8065e7f9f7519af5b05333 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -144,11 +144,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        
        // make sure we don't go beyond our char array memory
        size_t in_index = 0, out_index = 0;
        
        // make sure we don't go beyond our char array memory
        size_t in_index = 0, out_index = 0;

-       int max_len;    
+       int rowlen;     

        if (breaks==0)
        if (breaks==0)

-               max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+               rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;

        else
        else

-               max_len = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+               rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);

 
        static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
        //clear memory
 
        static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
        //clear memory


@@ -156,11 +156,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        char *tmp = buf;
 
        // loop through the out_index to make sure we don't go too far
        char *tmp = buf;
 
        // loop through the out_index to make sure we don't go too far

-       for (out_index=0; out_index < max_len-2; out_index++) {
+       for (out_index=0; out_index < rowlen-1; out_index++) {

                // set character
                // set character

-               sprintf(tmp++, "%u", (unsigned int) data[in_index]);
+               sprintf(tmp++, "%u", data[in_index]);

                // check if a line break is needed and we have room to print it in our array
                // check if a line break is needed and we have room to print it in our array

-               if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
+               if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {

                        // increment and print line break
                        out_index++;
                        sprintf(tmp++, "%s","\n");
                        // increment and print line break
                        out_index++;
                        sprintf(tmp++, "%s","\n");


@@ -168,7 +168,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
                in_index++;
        }
        // last char.
                in_index++;
        }
        // last char.

-       sprintf(tmp++, "%u", (unsigned int) data[in_index]);
+       sprintf(tmp++, "%u", data[in_index]);

        return buf;
 }
 
        return buf;
 }