X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8d0a3e87d7d2350f4a05698a42f57625e460e5d6..14edfd09c3dca127eb09393c0798e66f899adf28:/client/loclass/fileutils.c

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 74c36a4d..8ec52cfe 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -51,11 +51,11 @@
 int fileExists(const char *filename) {
 
 #ifdef _WIN32
-	struct _stat fileStat;
-	int result = _stat(filename, &fileStat);
+	struct _stat st;
+	int result = _stat(filename, &st);
 #else
-	struct stat fileStat;
-	int result = stat(filename, &fileStat);
+	struct stat st;
+	int result = stat(filename, &st);
 #endif
 	return result == 0;
 }
@@ -76,13 +76,14 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
 	/* We should have a valid filename now, e.g. dumpdata-3.bin */
 
 	/*Opening file for writing in binary mode*/
-	FILE *fh=fopen(fileName,"wb");
-	if(!fh) {
+	FILE *fileHandle=fopen(fileName,"wb");
+	if(!fileHandle) {
 		PrintAndLog("Failed to write to file '%s'", fileName);
+		free(fileName);
 		return 1;
 	}
-	fwrite(data, 1,	datalen, fh);
-	fclose(fh);
+	fwrite(data, 1,	datalen, fileHandle);
+	fclose(fileHandle);
 	PrintAndLog("Saved data to '%s'", fileName);
 	free(fileName);
 
@@ -94,10 +95,12 @@ int loadFile(const char *fileName, void* data, size_t datalen)
 	FILE *filehandle = fopen(fileName, "rb");
 	if(!filehandle) {
 		PrintAndLog("Failed to read from file '%s'", fileName);
+		free(filehandle);
 		return 1;
 	}
 	fread(data,datalen,1,filehandle);
 	fclose(filehandle);
+	free(filehandle);
 	return 0;
 }
 /**
@@ -110,11 +113,11 @@ int loadFile(const char *fileName, void* data, size_t datalen)
  */
 void prnlog(char *fmt, ...)
 {
-
+	char buffer[2048] = {0};
 	va_list args;
 	va_start(args,fmt);
-    PrintAndLog(fmt, args);
-    //vprintf(fmt,args);
+	vsprintf (buffer,fmt, args);
 	va_end(args);
-    //printf("\n");
+	PrintAndLog(buffer);
+
 }