minor code clean up

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index a077aae9020ba053f74c7d52e5e5fc82df4a32d2..382c85c6a64362216c18b3f0dd73a88d5db1ea0c 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -46,12 +46,18 @@ int ukbhit(void) {
 #endif
 
 // log files functions
 #endif
 
 // log files functions

-void AddLogLine(char *fileName, char *extData, char *c) {
+void AddLogLine(char *file, char *extData, char *c) {

        FILE *fLog = NULL;
        FILE *fLog = NULL;

-
-       fLog = fopen(fileName, "a");
+    char filename[FILE_PATH_SIZE] = {0x00};
+    int len = 0;
+
+    len = strlen(file);
+    if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+    memcpy(filename, file, len);
+   
+       fLog = fopen(filename, "a");

        if (!fLog) {
        if (!fLog) {

-               printf("Could not append log file %s", fileName);
+               printf("Could not append log file %s", filename);

                return;
        }
 
                return;
        }
 


@@ -102,30 +108,39 @@ void print_hex(const uint8_t * data, const size_t len)
        printf("\n");
 }
 
        printf("\n");
 }
 

-char * sprint_hex(const uint8_t * data, const size_t len) {
+char *sprint_hex(const uint8_t *data, const size_t len) {
+       
+       int maxLen = ( len > 1024/3) ? 1024/3 : len;

        static char buf[1024];
        static char buf[1024];

-       char * tmp = buf;
+       memset(buf, 0x00, 1024);
+       char *tmp = buf;

        size_t i;
 
        size_t i;
 

-       for (i=0; i < len && i < 1024/3; i++, tmp += 3)
-               sprintf(tmp, "%02x ", data[i]);
+       for (i=0; i < maxLen; ++i, tmp += 3)
+               sprintf(tmp, "%02X ", data[i]);

 
        return buf;
 }
 
 
        return buf;
 }
 

-char * sprint_bin(const uint8_t * data, const size_t len) {
+char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {

        
        int maxLen = ( len > 1024) ? 1024 : len;
        static char buf[1024];
        
        int maxLen = ( len > 1024) ? 1024 : len;
        static char buf[1024];

-       char * tmp = buf;
-       size_t i;
+       memset(buf, 0x00, 1024);
+       char *tmp = buf;

 
 

-       for (i=0; i < maxLen; ++i, ++tmp)
-               sprintf(tmp, "%u", data[i]);
+       for (size_t i=0; i < maxLen; ++i){
+               sprintf(tmp++, "%u", data[i]);
+               if (breaks > 0 && !((i+1) % breaks))
+                       sprintf(tmp++, "%s","\n");
+       }

 
        return buf;
 }
 
 
        return buf;
 }
 

+char *sprint_bin(const uint8_t *data, const size_t len) {
+       return sprint_bin_break(data, len, 0);
+}

 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
        while (len--) {
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
        while (len--) {


@@ -145,6 +160,20 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
        return num;
 }
 
        return num;
 }
 

+// aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
+// to
+// hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
+// up to 64 bytes or 512 bits
+uint8_t *SwapEndian64(uint8_t *src, size_t len){
+       static uint8_t temp[64]={0};
+       for (uint8_t block=0; block < (uint8_t)len/8; block++){
+               for (size_t i = 0; i < 8; i++){
+                       temp[i+(8*block)] = src[(7-i)+(8*block)];
+               }
+       }
+       return temp;
+}
+

 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {
 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {


@@ -205,6 +234,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
        return 0;
 }
 

+

 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;


@@ -219,6 +249,35 @@ uint8_t param_get8(const char *line, int paramnum)
        return param_get8ex(line, paramnum, 10, 0);
 }
 
        return param_get8ex(line, paramnum, 10, 0);
 }
 

+/**
+ * @brief Reads a decimal integer (actually, 0-254, not 255)
+ * @param line
+ * @param paramnum
+ * @return -1 if error
+ */
+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
+{
+       uint8_t val =  param_get8ex(line, paramnum, 255, 10);
+       if( (int8_t) val == -1) return 1;
+       (*destination) = val;
+       return 0;
+}
+/**
+ * @brief Checks if param is decimal
+ * @param line
+ * @param paramnum
+ * @return
+ */
+uint8_t param_isdec(const char *line, int paramnum)
+{
+       int bg, en;
+       //TODO, check more thorougly
+       if (!param_getptr(line, &bg, &en, paramnum)) return 1;
+               //              return strtoul(&line[bg], NULL, 10) & 0xff;
+
+       return 0;
+}
+

 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;