X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/76471e5d1734786f6095c0b689fa49c5f6e92136..2839f12e8623cb48adf4d9af70212960caefc60d:/client/util.c

diff --git a/client/util.c b/client/util.c
index c5c7d7fe..fdbd2648 100644
--- a/client/util.c
+++ b/client/util.c
@@ -12,8 +12,7 @@
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
-#include <termios.h>
-#include <sys/ioctl.h> 
+#include <sys/ttydefaults.h>
 
 int ukbhit(void) {
   int cnt = 0;
@@ -38,7 +37,6 @@ int ukbhit(void) {
 }
 
 #else
-#include <conio.h>
 int ukbhit(void) {
 	return kbhit();
 }
@@ -63,7 +61,10 @@ void AddLogLine(char *file, char *extData, char *c) {
 	fprintf(f, "%s", extData);
 	fprintf(f, "%s\n", c);
 	fflush(f);
-	fclose(f);
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
 }
 
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
@@ -143,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;
-	int max_len;	
+	int rowlen;	
 	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
-		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
@@ -155,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
-	for (out_index=0; out_index < max_len-2; out_index++) {
+	for (out_index=0; out_index < rowlen-1; out_index++) {
 		// 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
-		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");
@@ -167,7 +168,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
 		in_index++;
 	}
 	// last char.
-	sprintf(tmp++, "%u", (unsigned int) data[in_index]);
+	sprintf(tmp++, "%u", data[in_index]);
 	return buf;
 }
 
@@ -180,13 +181,38 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
 	char *tmp = buf;
 	memset(buf, 0x00, 1024);
 	size_t max_len = (len > 1010) ? 1010 : len;
-	sprintf(tmp, "%s| %s", sprint_hex(data, max_len) , data);	
+
+	sprintf(tmp, "%s| ", sprint_hex(data, max_len) );
+	
+	size_t i = 0;
+	size_t pos = (max_len * 3)+2;
+	while(i < max_len){
+		char c = data[i];
+		if ( (c < 32) || (c == 127))
+			c = '.';
+		sprintf(tmp+pos+i, "%c",  c);
+		++i;
+	}
+	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] = (uint8_t) n;
+		dest[len] = n & 0xFF;
 		n >>= 8;
 	}
 }
@@ -283,9 +309,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
 char param_getchar(const char *line, int paramnum)
 {
 	int bg, en;
-	
 	if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
-
 	return line[bg];
 }
 
@@ -326,7 +350,6 @@ uint8_t param_isdec(const char *line, int paramnum)
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
 	int bg, en;
-
 	if (!param_getptr(line, &bg, &en, paramnum)) 
 		return strtoul(&line[bg], NULL, base) & 0xff;
 	else
@@ -336,7 +359,6 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 {
 	int bg, en;
-
 	if (!param_getptr(line, &bg, &en, paramnum)) 
 		return strtoul(&line[bg], NULL, base);
 	else
@@ -346,7 +368,6 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 {
 	int bg, en;
-
 	if (!param_getptr(line, &bg, &en, paramnum)) 
 		return strtoull(&line[bg], NULL, base);
 	else
@@ -355,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 bg, en, temp, i;
+	int bg, en, i;
+	uint32_t temp;
 
 	if (hexcnt & 1) return 1;
 	
@@ -374,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 bg, en, temp, i;
+	int bg, en, i;
+	uint32_t temp;
 
 	//if (hexcnt % 2)
 	//	return 1;
@@ -397,7 +420,6 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 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);