CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting...

[proxmark3-svn] / client / loclass / fileutils.c

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index c8d56ce3dbbf3c23cea28df702d05828cfd2ff32..8ec52cfeb8d4da51c86797362dc473cf1df4f128 100644 (file)
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -49,14 +49,20 @@
  * @return
  */
 int fileExists(const char *filename) {
-    struct stat st;
-    int result = stat(filename, &st);
+
+#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);
@@ -72,12 +78,13 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
        /*Opening file for writing in binary mode*/
        FILE *fileHandle=fopen(fileName,"wb");
        if(!fileHandle) {
-               prnlog("Failed to write to file '%s'", fileName);
+               PrintAndLog("Failed to write to file '%s'", fileName);
+               free(fileName);
                return 1;
        }
        fwrite(data, 1, datalen, fileHandle);
        fclose(fileHandle);
-       prnlog("Saved data to '%s'", fileName);
+       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);
+
 }