X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/55acbb2a3903f7940d0db5fae2e8f4fdab51d1b8..9a573554e0c86736cbded236edb363cd566ffa47:/client/util.c?ds=sidebyside

diff --git a/client/util.c b/client/util.c
index 8a62e361..15e911a1 100644
--- a/client/util.c
+++ b/client/util.c
@@ -10,7 +10,7 @@
 
 #include "util.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
@@ -80,15 +80,13 @@ void AddLogCurrentDT(char *fileName) {
 	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);
 	
-	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); 
-	
-	printf("fname:%s", fileName);
 }
 
 // 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)) 
-		return strtol(&line[bg], NULL, base) & 0xff;
+		return strtoul(&line[bg], NULL, base) & 0xff;
 	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)) 
-		return strtol(&line[bg], NULL, base);
+		return strtoul(&line[bg], NULL, base);
 	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)) 
-		return strtoll(&line[bg], NULL, base);
+		return strtoull(&line[bg], NULL, base);
 	else
 		return deflt;