* Add an option to lf read command to use an arbitrary divisor, enabling reading...

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 8a62e361aec8f9ba8452c12887627d13eabe70b5..15e911a146940800ee305efdfa9729268745abc9 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -10,7 +10,7 @@
 
 #include "util.h"
 
 
 #include "util.h"
 

-#ifndef WIN32
+#ifndef _WIN32

 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)


@@ -80,15 +80,13 @@ void AddLogCurrentDT(char *fileName) {
        AddLogLine(fileName, "\nanticollision: ", buff);
 }
 
        AddLogLine(fileName, "\nanticollision: ", buff);
 }
 

-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext) {
+void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {

        char * fnameptr = fileName;
        memset(fileName, 0x00, 200);
        
        char * fnameptr = fileName;
        memset(fileName, 0x00, 200);
        

-       for (int j = 0; j < 7; j++, fnameptr += 2)
+       for (int j = 0; j < byteCount; j++, fnameptr += 2)

                sprintf(fnameptr, "%02x", uid[j]); 
        sprintf(fnameptr, "%s", ext); 
                sprintf(fnameptr, "%02x", uid[j]); 
        sprintf(fnameptr, "%s", ext); 

-       
-       printf("fname:%s", fileName);

 }
 
 // printing and converting functions
 }
 
 // printing and converting functions


@@ -190,7 +188,7 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 

-               return strtol(&line[bg], NULL, base) & 0xff;
+               return strtoul(&line[bg], NULL, base) & 0xff;

        else
                return deflt;
 }
        else
                return deflt;
 }


@@ -200,7 +198,7 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 

-               return strtol(&line[bg], NULL, base);
+               return strtoul(&line[bg], NULL, base);

        else
                return deflt;
 }
        else
                return deflt;
 }


@@ -210,7 +208,7 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 

-               return strtoll(&line[bg], NULL, base);
+               return strtoull(&line[bg], NULL, base);

        else
                return deflt;
 
        else
                return deflt;