ADD: Added @marshmellow42 's new ST (sequence terminator detection)

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index ab1582223a5bfff47f802ada8676c7c2e2923c2a..ce5d9f162c58c90e3f3295798405e0bd856cddd7 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -104,14 +104,18 @@ void print_hex(const uint8_t * data, const size_t len) {
        printf("\n");
 }
 void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
-       size_t i;
-       for ( i = 0; i < len; ++i) {
+
+       int rownum = 0;
+       printf("[%02d] | ", rownum);
+       for (int i = 0; i < len; ++i) {
 
                printf("%02X ", data[i]);
                
                // check if a line break is needed
-               if ( breaks > 0 && !(i+1 % breaks) )
-                       printf("(%d %d)\n", i+1 , breaks);
+               if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
+                       ++rownum;
+                       printf("\n[%02d] | ", rownum);
+               }
        }
        printf("\n");
 }
@@ -147,7 +151,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        // loop through the out_index to make sure we don't go too far
        for (size_t out_index=0; out_index < max_len-2; out_index++) {
                // set character
-               sprintf(tmp++, "%u", data[in_index]);
+               sprintf(tmp++, "%u", (unsigned int) 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) ) {
                        // increment and print line break