ADD: Holimans new changes in master.

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

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 08b81ec0bcd26c72e879642b0354605616b6aa63..443070c121b0817bb8adfc7fe9a7a7fb3c9a502e 100644 (file)
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -1,3 +1,41 @@
+/*****************************************************************************
+ * WARNING
+ *
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
+ * 
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
+ * 
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ *
+ *****************************************************************************
+ *
+ * This file is part of loclass. It is a reconstructon of the cipher engine
+ * used in iClass, and RFID techology.
+ *
+ * The implementation is based on the work performed by
+ * Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
+ * Milosch Meriac in the paper "Dismantling IClass".
+ *
+ * Copyright (C) 2014 Martin Holst Swende
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * 
+ ****************************************************************************/
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -11,14 +49,20 @@
  * @return
  */
 int fileExists(const char *filename) {
-       struct _stat st;
-       int result = stat(filename, &st);
+
+#ifdef _WIN32
+       struct _stat fileStat;
+       int result = _stat(filename, &fileStat);
+#else
+       struct stat fileStat;
+       int result = stat(filename, &fileStat);
+#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);
@@ -32,19 +76,33 @@ 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;
 }
 
+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;
+}
 /**
  * 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).