CHG: fixed a better detection for Ultralight, Ultralight-C, Ultralight-EV1 tags.

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

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index deab3137a5704d798374430725f48661c3b07ff8..e5e5c5b0569270c422c53e83078d738a64f9e106 100644 (file)
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -35,6 +35,7 @@
  * 
  * 
  ****************************************************************************/
  * 
  * 
  ****************************************************************************/

+#ifndef ON_DEVICE

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -49,8 +50,14 @@
  * @return
  */
 int fileExists(const char *filename) {
  * @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;
 }
 
        return result == 0;
 }
 


@@ -70,30 +77,20 @@ 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*/
        /* 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) {
-               PrintAndLog("Failed to write to file '%s'", fileName);
+       FILE *fileHandle=fopen(fileName,"wb");
+       if(!fileHandle) {
+               prnlog("Failed to write to file '%s'", fileName);
+               free(fileName);

                return 1;
        }
                return 1;
        }

-       fwrite(data, 1, datalen, fh);
-       fclose(fh);
-       PrintAndLog("Saved data to '%s'", fileName);
+       fwrite(data, 1, datalen, fileHandle);
+       fclose(fileHandle);
+       prnlog("Saved data to '%s'", fileName);

        free(fileName);
 
        return 0;
 }
 
        free(fileName);
 
        return 0;
 }
 

-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);
-               return 1;
-       }
-       fread(data,datalen,1,filehandle);
-       fclose(filehandle);
-       return 0;
-}

 /**
  * Utility function to print to console. This is used consistently within the library instead
  * of printf, but it actually only calls printf (and adds a linebreak).
 /**
  * Utility function to print to console. This is used consistently within the library instead
  * of printf, but it actually only calls printf (and adds a linebreak).


@@ -104,11 +101,18 @@ int loadFile(const char *fileName, void* data, size_t datalen)
  */
 void prnlog(char *fmt, ...)
 {
  */
 void prnlog(char *fmt, ...)
 {

-
+       char buffer[2048] = {0};

        va_list args;
        va_start(args,fmt);
        va_list args;
        va_start(args,fmt);

-    PrintAndLog(fmt, args);
-    //vprintf(fmt,args);
+       vsprintf (buffer,fmt, args);

        va_end(args);
        va_end(args);

-    //printf("\n");
+       PrintAndLog(buffer);
+

 }
 }

+#else //if we're on ARM
+void prnlog(char *fmt,...)
+{
+       return;
+}
+
+#endif