From f56b1fae2d2c3bb9ecbdf018f1a3512df4031459 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 17 Jan 2017 22:58:16 +0100 Subject: [PATCH] FIX: sprint_bin_break didn't print the last digit in array. --- client/cmdlft55xx.c | 8 ++++---- client/util.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 0544d072..5d36547b 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -195,8 +195,8 @@ static int CmdHelp(const char *Cmd); void printT5xxHeader(uint8_t page){ PrintAndLog("Reading Page %d:", page); - PrintAndLog("blk | hex data | binary | ascii"); - PrintAndLog("----+----------+---------------------------------+-------"); + PrintAndLog("blk | hex data | binary | ascii"); + PrintAndLog("----+----------+----------------------------------+-------"); } int CmdT55xxSetConfig(const char *Cmd) { @@ -907,8 +907,8 @@ int special(const char *Cmd) { uint32_t blockData = 0; uint8_t bits[32] = {0x00}; - PrintAndLog("OFFSET | DATA | BINARY | ASCII"); - PrintAndLog("-------+-------+------------------------------------+------"); + PrintAndLog("OFFSET | DATA | BINARY | ASCII"); + PrintAndLog("-------+-------+-------------------------------------+------"); int i,j = 0; for (; j < 64; ++j){ diff --git a/client/util.c b/client/util.c index 76c8d6d8..a3590a39 100644 --- 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; - int max_len; + int rowlen; 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 - 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 @@ -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 - for (out_index=0; out_index < max_len-2; out_index++) { + for (out_index=0; out_index < rowlen-1; out_index++) { // 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 - 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"); @@ -168,7 +168,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea in_index++; } // last char. - sprintf(tmp++, "%u", (unsigned int) data[in_index]); + sprintf(tmp++, "%u", data[in_index]); return buf; } -- 2.39.2