chg: too many \ slashes

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index c07981fed90769d93bde3de9802e37a4e8cd4835..4adc4e701866f4d86628211a764da761e8734266 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -75,7 +75,7 @@ void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
        char buf[20] = {0};
        memset(buf, 0x00, sizeof(buf));
        //sprintf(buf, "%X%X", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
        char buf[20] = {0};
        memset(buf, 0x00, sizeof(buf));
        //sprintf(buf, "%X%X", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));

-       sprintf(buf, "%012"llx"", data);
+       sprintf(buf, "%012" PRIx64 "", data);

        AddLogLine(fileName, extData, buf);
 }
 
        AddLogLine(fileName, extData, buf);
 }
 


@@ -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;
 }
 


@@ -196,6 +196,20 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
        return buf;
 }
 
        return buf;
 }
 

+char *sprint_ascii(const uint8_t *data, const size_t len) {
+       static char buf[1024];
+       char *tmp = buf;
+       memset(buf, 0x00, 1024);
+       size_t max_len = (len > 1010) ? 1010 : len;
+       size_t i = 0;
+       while(i < max_len){
+               char c = data[i];
+               tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
+               ++i;
+       }
+       return buf;
+}
+

 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
        while (len--) {
                dest[len] = n & 0xFF;
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
        while (len--) {
                dest[len] = n & 0xFF;


@@ -362,7 +376,8 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 {
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 {

-       int bg, en, temp, i;
+       int bg, en, i;
+       uint32_t temp;

 
        if (hexcnt & 1) return 1;
        
 
        if (hexcnt & 1) return 1;
        


@@ -381,7 +396,8 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 }
 int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 {
 }
 int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 {

-       int bg, en, temp, i;
+       int bg, en, i;
+       uint32_t temp;

 
        //if (hexcnt % 2)
        //      return 1;
 
        //if (hexcnt % 2)
        //      return 1;