From b5545f4c359edde9425c537f376dd6aae45a175d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 20 Mar 2018 08:23:54 +0100
Subject: [PATCH] chg: 'trace save' - now uses fileutils.c instead.

---
 client/cmdtrace.c          | 48 ++++----------------------------------
 client/cmdtrace.h          |  1 +
 client/loclass/fileutils.c |  9 +++----
 3 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index e09003158..ffd9bbffd 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -539,8 +539,6 @@ int CmdTraceList(const char *Cmd) {
 int CmdTraceLoad(const char *Cmd) {
 	
 	FILE *f = NULL;
-	size_t bytes_read;
-	uint8_t buf[2];
 	char filename[FILE_PATH_SIZE];
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_load();	
@@ -562,43 +560,19 @@ int CmdTraceLoad(const char *Cmd) {
 		fclose(f);
 		return 3;
 	}
-	
-	// iceman, RDV40 be able to log much bigger than 64kb.
-	// so this two byte limit will have a magic value (above 40kb limit from bigbuff)
-	// or we just skip this limit at all
-	bytes_read = fread(buf, 1, 2, f);
-	if (bytes_read != 2) {
-		PrintAndLogEx(FAILED, "error, when reading dumpsize");
-		fclose(f);
-		return 1;
-	}
-	
+
 	if ( trace )
 		free(trace);
 
-	// old dumpsize two first bytes of file
-	traceLen = bytes_to_num(buf, 2); // little endian in file
-		
-	// RDV40 will have bigger traces
-	if (fsize > traceLen + 2 ){
-		traceLen = fsize;
-		trace = malloc(fsize);		
-	} else {
-		trace = malloc(traceLen+2);
-	}
-	
+	trace = malloc(fsize);	
 	if (trace == NULL) {
 		PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
 		fclose(f);		
 		return 2;
 	}
 	
-	bytes_read = fread(trace, 1, traceLen, f);
-	if (bytes_read != traceLen) {
-		PrintAndLogEx(FAILED, "File reading error. %d -- %d", bytes_read, traceLen);
-		fclose(f);
-		return 1;
-	}
+	size_t bytes_read = fread(trace, 1, fsize, f);
+	traceLen = bytes_read;
 	fclose(f);
 	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) loaded from file %s", traceLen, filename);	
 	return 0;
@@ -611,26 +585,14 @@ int CmdTraceSave(const char *Cmd) {
 		return 0;
 	}
 	
-	FILE *f = NULL;
-	uint8_t buf[2] = {0x01, 0xCE};
 	char filename[FILE_PATH_SIZE];	
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') return usage_trace_save();
 	
 	param_getstr(Cmd, 0, filename, sizeof(filename));	
 	
-	if ((f = fopen(filename, "wb")) == NULL) { 
-		PrintAndLogEx(FAILED, "Could not create file %s", filename);
-		return 1;
-	}
+	saveFile(filename, "bin", trace, traceLen);
 
-	// 40kb bigbuffer limit
-	if ( traceLen <= 40000 ) {
-		num_to_bytes(traceLen, 2, buf);
-	}
-	fwrite(buf, 1, 2, f);
-	fwrite(trace, 1, traceLen, f);
-	fclose(f);
 	PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = %d bytes) written to file %s", traceLen, filename);
 	return 0;
 }
diff --git a/client/cmdtrace.h b/client/cmdtrace.h
index e78130693..fa3f97c20 100644
--- a/client/cmdtrace.h
+++ b/client/cmdtrace.h
@@ -26,6 +26,7 @@
 #include "cmdparser.h"		// for getting cli commands included in cmdmain.h
 #include "cmdmain.h"		// for sending cmds to device
 #include "data.h"			// for GetFromBigBuf
+#include "loclass/fileutils.h"		// for saveFile
 
 extern int CmdTrace(const char *Cmd);
 
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index fab9f88dd..8fa427921 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -60,8 +60,7 @@ int fileExists(const char *filename) {
 	return result == 0;
 }
 
-int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen)
-{
+int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) {
 	int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
 	char * fileName = malloc(size);
 
@@ -147,8 +146,7 @@ out:
  * write also to a logfile. When doing so, just delete this function.
  * @param fmt
  */
-void PrintAndLogDevice(logLevel_t level, char *fmt, ...)
-{
+void PrintAndLogDevice(logLevel_t level, char *fmt, ...) {
 	char buffer[2048] = {0};
 	va_list args;
 	va_start(args, fmt);
@@ -157,8 +155,7 @@ void PrintAndLogDevice(logLevel_t level, char *fmt, ...)
 	PrintAndLogEx(level, buffer);
 }
 #else //if we're on ARM
-void PrintAndLogDevice(logLevel_t level, char *fmt,...)
-{
+void PrintAndLogDevice(logLevel_t level, char *fmt, ...) {
 	return;
 }