X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/873014de8a4be0f68524531cc90fe6c1dfdffded..81cd0474cb4dc85fcc78f70ad238cb684851f75f:/client/util.c

diff --git a/client/util.c b/client/util.c
index 6825d721..be947b8a 100644
--- a/client/util.c
+++ b/client/util.c
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include "util.h"
 
-#ifdef __linux__
+#ifndef WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
@@ -89,6 +89,10 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
 	return num;
 }
 
+//  -------------------------------------------------------------------------
+//  string parameters lib
+//  -------------------------------------------------------------------------
+
 //  -------------------------------------------------------------------------
 //  line     - param line
 //  bg, en   - symbol numbers in param line of beginning an ending parameter
@@ -162,7 +166,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 strtol(&line[bg], NULL, base);
+		return strtoll(&line[bg], NULL, base);
 	else
 		return deflt;
 
@@ -190,3 +194,15 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 
 	return 0;
 }
+
+int param_getstr(const char *line, int paramnum, char * str)
+{
+	int bg, en;
+
+	if (param_getptr(line, &bg, &en, paramnum)) return 0;
+	
+	memcpy(str, line + bg, en - bg + 1);
+	str[en - bg + 1] = 0;
+	
+	return en - bg + 1;
+}