X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2ae8a312e058f71d0f02be4f2f9cc6f284ebbf34..10403a6a3005f81839603dcb415ee352f939c06b:/client/loclass/fileutils.c

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 6d990171..6475c126 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -49,14 +49,20 @@
  * @return
  */
 int fileExists(const char *filename) {
-	struct _stat fileStat;
-	int result = _stat(filename, &fileStat);
+
+#ifdef _WIN32
+	struct _stat st;
+	int result = _stat(filename, &st);
+#else
+	struct stat st;
+	int result = stat(filename, &st);
+#endif
 	return result == 0;
 }
 
 int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen)
 {
-	int size = sizeof(char) * (strlen(preferredName)+strlen(suffix)+5);
+	int size = sizeof(char) * (strlen(preferredName)+strlen(suffix)+10);
 	char * fileName = malloc(size);
 
 	memset(fileName,0,size);
@@ -70,14 +76,15 @@ 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 *fileHandle=fopen(fileName,"wb");
-	if(!fileHandle) {
-		prnlog("Failed to write to file '%s'", fileName);
+	FILE *fh=fopen(fileName,"wb");
+	if(!fh) {
+		PrintAndLog("Failed to write to file '%s'", fileName);
+		free(fh);
 		return 1;
 	}
-	fwrite(data, 1,	datalen, fileHandle);
-	fclose(fileHandle);
-	prnlog("Saved data to '%s'", fileName);
+	fwrite(data, 1,	datalen, fh);
+	fclose(fh);
+	PrintAndLog("Saved data to '%s'", fileName);
 	free(fileName);
 
 	return 0;
@@ -87,11 +94,13 @@ int loadFile(const char *fileName, void* data, size_t datalen)
 {
 	FILE *filehandle = fopen(fileName, "rb");
 	if(!filehandle) {
-		prnlog("Failed to read from file '%s'", fileName);
+		PrintAndLog("Failed to read from file '%s'", fileName);
+		free(filehandle);
 		return 1;
 	}
 	fread(data,datalen,1,filehandle);
 	fclose(filehandle);
+	free(filehandle);
 	return 0;
 }
 /**
@@ -104,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);
+
 }